Fix test name and use mock.patch.dict

sebastinas · sebastinas · commit 60c4c0895929 · 2015-02-07T19:45:20.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -314,31 +314,27 @@ class TestCurtsiesStartup(TestCase):
 
     def setUp(self):
         self.repl = create_repl()
-        self.startupfile = tempfile.NamedTemporaryFile()
-        self.startupfile.__enter__()
-        os.environ['PYTHONSTARTUP'] = self.startupfile.name
 
-    def tearDown(self):
-        self.startupfile.__exit__(None, None, None)
-        del os.environ['PYTHONSTARTUP']
-
-    def write_startup_file(self, encoding):
-        with io.open(self.startupfile.name, mode='wt',
-                     encoding=encoding) as f:
+    def write_startup_file(self, fname, encoding):
+        with io.open(fname, mode='wt', encoding=encoding) as f:
             f.write('# coding: ')
             f.write(encoding)
             f.write('\n')
             f.write('from __future__ import unicode_literals\n')
             f.write('a = "äöü"\n')
 
     def test_startup_event_utf8(self):
-        self.write_startup_file('utf-8')
-        self.repl.process_event(bpythonevents.RunStartupFileEvent())
+        with tempfile.NamedTemporaryFile() as temp:
+            self.write_startup_file(temp.name, 'utf-8')
+            with mock.patch.dict('os.environ', {'PYTHONSTARTUP': temp.name}):
+                self.repl.process_event(bpythonevents.RunStartupFileEvent())
         self.assertIn('a', self.repl.interp.locals)
 
-    def test_startup_event_utf8(self):
-        self.write_startup_file('latin-1')
-        self.repl.process_event(bpythonevents.RunStartupFileEvent())
+    def test_startup_event_latin1(self):
+        with tempfile.NamedTemporaryFile() as temp:
+            self.write_startup_file(temp.name, 'latin-1')
+            with mock.patch.dict('os.environ', {'PYTHONSTARTUP': temp.name}):
+                self.repl.process_event(bpythonevents.RunStartupFileEvent())
         self.assertIn('a', self.repl.interp.locals)
 
 
