diff options
| author | Éric Araujo <merwok@netwok.org> | 2012-02-17 17:10:11 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2012-02-17 17:10:11 (GMT) |
| commit | f1fd388c775acee4d1e5f560b3ae9dfb9ad7cd16 (patch) | |
| tree | 6ea3910d5c04f752561c406c2ad2f5806fd820c9 | |
| parent | 082f177c67d8dc7edd16dd5db764e28f5a0795f1 (diff) | |
| parent | 2180ee641cbbc8c9d2318479907618b5c9cd6006 (diff) | |
| download | cpython-f1fd388c775acee4d1e5f560b3ae9dfb9ad7cd16.zip cpython-f1fd388c775acee4d1e5f560b3ae9dfb9ad7cd16.tar.gz cpython-f1fd388c775acee4d1e5f560b3ae9dfb9ad7cd16.tar.bz2 | |
Branch merge
| -rw-r--r-- | Lib/packaging/tests/support.py | 2 | ||||
| -rw-r--r-- | Lib/packaging/tests/test_util.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Lib/packaging/tests/support.py b/Lib/packaging/tests/support.py index 06f06c9..d76d3db 100644 --- a/Lib/packaging/tests/support.py +++ b/Lib/packaging/tests/support.py @@ -342,7 +342,7 @@ def _get_xxmodule_path(): srcdir = sysconfig.get_config_var('projectbase') path = os.path.join(os.getcwd(), srcdir, 'Modules', 'xxmodule.c') else: - os.path.join(os.path.dirname(__file__), 'xxmodule.c') + path = os.path.join(os.path.dirname(__file__), 'xxmodule.c') if os.path.exists(path): return path diff --git a/Lib/packaging/tests/test_util.py b/Lib/packaging/tests/test_util.py index 737503e..7f7ed18 100644 --- a/Lib/packaging/tests/test_util.py +++ b/Lib/packaging/tests/test_util.py @@ -173,6 +173,11 @@ class UtilTestCase(support.EnvironRestorer, sys.stdout = self.old_stdout sys.stderr = self.old_stderr + def test_set_platform(self): + self.addCleanup(util.set_platform, util.get_platform()) + util.set_platform("fake") + self.assertEqual("fake", util.get_platform()) + def test_convert_path(self): # linux/mac os.sep = '/' |