From 4add322f766b7ef27946f0a11760a51f3d5af100 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Thu, 5 May 2016 11:56:47 +0200
Subject: [PATCH] Try to eliminate test nondeterminism

---
 src/test/java/jline/TerminalFactoryTest.java | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/test/java/jline/TerminalFactoryTest.java b/src/test/java/jline/TerminalFactoryTest.java
index c9bbc4d..ba29f3f 100644
--- a/src/test/java/jline/TerminalFactoryTest.java
+++ b/src/test/java/jline/TerminalFactoryTest.java
@@ -81,10 +81,14 @@ public class TerminalFactoryTest
         expect(System.getenv("OSV_CPUS")).andReturn(null);
         replayAll();
 
-        Terminal t = TerminalFactory.get();
-        verifyAll();
-        assertNotNull(t);
-        assertEquals(expectedTerminalClassName, t.getClass().getName());
+        try {
+            Terminal t = TerminalFactory.get();
+            verifyAll();
+            assertNotNull(t);
+            assertEquals(expectedTerminalClassName, t.getClass().getName());
+        } finally {
+            System.clearProperty(TerminalFactory.JLINE_TERMINAL);
+        }
     }
 
     @Test
@@ -96,9 +100,13 @@ public class TerminalFactoryTest
         expect(System.getenv("INSIDE_EMACS")).andReturn(null);
         replayAll();
 
-        Terminal t = TerminalFactory.get();
-        verifyAll();
-        assertNotNull(t);
-        assertEquals(UnsupportedTerminal.class.getName(), t.getClass().getName());
+        try {
+            Terminal t = TerminalFactory.get();
+            verifyAll();
+            assertNotNull(t);
+            assertEquals(UnsupportedTerminal.class.getName(), t.getClass().getName());
+        } finally {
+            System.clearProperty(TerminalFactory.JLINE_TERMINAL);
+        }
     }
-}
\ No newline at end of file
+}
-- 
2.5.5