diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-02-11 21:39:34 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-02-11 21:39:34 +0100 |
| commit | 9f190d9bff26d8b51f1c97fa04a24e6df51b62bd (patch) | |
| tree | 82ec82152bbb23f79bfa809e6ceec18e41b42cfc | |
| parent | 2d0a4b6582fa3850980f93b1976cb54884dd55ff (diff) | |
| parent | 8d8ff26698fd758a85f34133030e6c0dfe569d6f (diff) | |
| download | psutil-9f190d9bff26d8b51f1c97fa04a24e6df51b62bd.tar.gz | |
Merge branch 'master' of github.com:giampaolo/psutil
| -rw-r--r-- | psutil/tests/test_process.py | 8 |
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='รจ') |