resolve travis environment reference and assertRaises

pexpect · Jul 20, 2014 · bc2f43f · bc2f43f
1 parent 95dbd49
commit bc2f43f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/tests/test_misc.py b/tests/test_misc.py
@@ -352,7 +352,7 @@ def test_exception_tb(self):
             assert False, "Should have raised an exception."
 
 
-if os.environ.get('TRAVIS', None) is not None:
+if os.environ.get('TRAVIS', None) != 'true':
     # Travis-CI demonstrates unexpected behavior.
 
     class TestCaseCanon(PexpectTestCase.PexpectTestCase):
@@ -412,7 +412,7 @@ def test_under_max_canon(self):
             child.expect_exact('_' * send_bytes)
 
             # BEL is not found,
-            with self.assertRaises(pexpect.TIMEOUT, timeout=1):
+            with self.assertRaises(pexpect.TIMEOUT):
                 child.expect_exact('\a')
 
             # cleanup,
@@ -436,7 +436,7 @@ def test_at_max_icanon(self):
             child.expect_exact('\a')
 
             # verify, no more additional BELs expected
-            with self.assertRaises(pexpect.TIMEOUT, timeout=1):
+            with self.assertRaises(pexpect.TIMEOUT):
                 child.expect_exact('\a')
 
             # exercise, we must now backspace to send CR.