Use no_coverage_env() in some more tests

4 files changed, 12 insertions, 9 deletions

diff --git a/tests/interact.py b/tests/interact.py
index 3ea8c5b..5cc5e29 100755
--- a/tests/interact.py
+++ b/tests/interact.py
@@ -25,11 +25,12 @@ try:
 except ImportError:
     pass
 
+from utils import no_coverage_env
 import pexpect
 import sys
 
 def main():
-    p = pexpect.spawn(sys.executable + ' echo_w_prompt.py')
+    p = pexpect.spawn(sys.executable + ' echo_w_prompt.py', env=no_coverage_env())
     p.interact()
 
 if __name__ == '__main__':
diff --git a/tests/interact_unicode.py b/tests/interact_unicode.py
index 873bb71..93426dc 100644
--- a/tests/interact_unicode.py
+++ b/tests/interact_unicode.py
@@ -9,11 +9,12 @@ try:
 except ImportError:
     pass
 
+from utils import no_coverage_env
 import pexpect
 import sys
 
 def main():
-    p = pexpect.spawnu(sys.executable + ' echo_w_prompt.py')
+    p = pexpect.spawnu(sys.executable + ' echo_w_prompt.py', env=no_coverage_env())
     p.interact()
 
 if __name__ == '__main__':
diff --git a/tests/test_expect.py b/tests/test_expect.py
index 43b2858..4e99aad 100755
--- a/tests/test_expect.py
+++ b/tests/test_expect.py
@@ -20,10 +20,10 @@ PEXPECT LICENSE
 '''
 import pexpect
 import unittest
-import os
 import subprocess
 import time
 from . import PexpectTestCase
+from .utils import no_coverage_env
 import signal
 
 # Many of these test cases blindly assume that sequential directory
@@ -73,12 +73,6 @@ class assert_raises_msg(object):
 
         return True
 
-def no_coverage_env():
-    "Return a copy of os.environ that won't trigger coverage measurement."
-    env = os.environ.copy()
-    env.pop('COV_CORE_SOURCE', None)
-    return env
-
 class ExpectTestCase (PexpectTestCase.PexpectTestCase):
 
     def test_expect_basic (self):
diff --git a/tests/utils.py b/tests/utils.py
new file mode 100644
index 0000000..dcd3aa0
--- /dev/null
+++ b/tests/utils.py
@@ -0,0 +1,7 @@
+import os
+
+def no_coverage_env():
+    "Return a copy of os.environ that won't trigger coverage measurement."
+    env = os.environ.copy()
+    env.pop('COV_CORE_SOURCE', None)
+    return env
\ No newline at end of file