Use monkeypatch's setenv, getenv

1 files changed, 7 insertions, 8 deletions

diff --git a/numpy/distutils/tests/test_fcompiler.py b/numpy/distutils/tests/test_fcompiler.py
index 4ab1522d7..1bd4e50d3 100644
--- a/numpy/distutils/tests/test_fcompiler.py
+++ b/numpy/distutils/tests/test_fcompiler.py
@@ -2,7 +2,6 @@ from __future__ import division, absolute_import, print_function
 
 from numpy.testing import assert_
 import numpy.distutils.fcompiler
-import os
 
 customizable_flags = [
     ('f77', 'F77FLAGS'),
@@ -15,8 +14,8 @@ customizable_flags = [
 ]
 
 
-def test_fcompiler_flags_override(monkeypatch):
-    monkeypatch.setitem(os.environ, 'NPY_DISTUTILS_APPEND_FLAGS', '0')
+def test_fcompiler_flags(monkeypatch):
+    monkeypatch.setenv('NPY_DISTUTILS_APPEND_FLAGS', '0')
     fc = numpy.distutils.fcompiler.new_fcompiler(compiler='none')
     flag_vars = fc.flag_vars.clone(lambda *args, **kwargs: None)
 
@@ -24,13 +23,12 @@ def test_fcompiler_flags_override(monkeypatch):
         new_flag = '-dummy-{}-flag'.format(opt)
         prev_flags = getattr(flag_vars, opt)
 
-        monkeypatch.setitem(os.environ, envvar, new_flag)
+        monkeypatch.setenv(envvar, new_flag)
         new_flags = getattr(flag_vars, opt)
+        monkeypatch.delenv(envvar)
         assert_(new_flags == [new_flag])
 
-
-def test_fcompiler_flags_append(monkeypatch):
-    monkeypatch.setitem(os.environ, 'NPY_DISTUTILS_APPEND_FLAGS', '1')
+    monkeypatch.setenv('NPY_DISTUTILS_APPEND_FLAGS', '1')
     fc = numpy.distutils.fcompiler.new_fcompiler(compiler='none')
     flag_vars = fc.flag_vars.clone(lambda *args, **kwargs: None)
 
@@ -38,8 +36,9 @@ def test_fcompiler_flags_append(monkeypatch):
         new_flag = '-dummy-{}-flag'.format(opt)
         prev_flags = getattr(flag_vars, opt)
 
-        monkeypatch.setitem(os.environ, envvar, new_flag)
+        monkeypatch.setenv(envvar, new_flag)
         new_flags = getattr(flag_vars, opt)
+        monkeypatch.delenv(envvar)
         if prev_flags is None:
             assert_(new_flags == [new_flag])
         else: