summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2016-02-11 12:21:02 -0800
committerGiampaolo Rodola <g.rodola@gmail.com>2016-02-11 12:21:02 -0800
commit8d8ff26698fd758a85f34133030e6c0dfe569d6f (patch)
tree0d8d21e04f3296158864620c023ee19fa9adfbb0
parent51de28ff17dc57f65ff40760d4783d9eec269e46 (diff)
downloadpsutil-8d8ff26698fd758a85f34133030e6c0dfe569d6f.tar.gz
fix unicode test failure on windows
-rw-r--r--psutil/tests/test_process.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
index e4bb92ee..e96cf233 100644
--- a/psutil/tests/test_process.py
+++ b/psutil/tests/test_process.py
@@ -1888,11 +1888,11 @@ class TestUnicode(unittest.TestCase):
env['FUNNY_ARG'] = self.uexe
sproc = get_test_subprocess(env=env)
p = psutil.Process(sproc.pid)
- if PY3 and WINDOWS:
- self.assertEqual(p.environ()['FUNNY_ARG'],
- self.uexe.decode(sys.getfilesystemencoding()))
+ if WINDOWS and not PY3:
+ uexe = self.uexe.decode(sys.getfilesystemencoding())
else:
- self.assertEqual(p.environ()['FUNNY_ARG'], self.uexe)
+ uexe = self.uexe
+ self.assertEqual(p.environ()['FUNNY_ARG'], uexe)
def test_disk_usage(self):
path = tempfile.mkdtemp(prefix='psutil', suffix='รจ')