aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/tests
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-10-14 23:10:15 -0400
committerJason R. Coombs <jaraco@jaraco.com>2016-10-14 23:10:15 -0400
commitc52797512e98c12a383c41697deda0f563b452a5 (patch)
treeb358a4187f00d115e90161804ac35973ee6fd565 /setuptools/tests
parent6ef8ff56dfdba9a51ce55b9a6cd8ff922d786ac1 (diff)
downloadexternal_python_setuptools-c52797512e98c12a383c41697deda0f563b452a5.tar.gz
external_python_setuptools-c52797512e98c12a383c41697deda0f563b452a5.tar.bz2
external_python_setuptools-c52797512e98c12a383c41697deda0f563b452a5.zip
Just skip these tests on Python 2.6.
Diffstat (limited to 'setuptools/tests')
-rw-r--r--setuptools/tests/test_egg_info.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 240385a2..4c767826 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -63,12 +63,18 @@ class TestEggInfo(object):
})
yield env
+ dict_order_fails = pytest.mark.skipif(
+ sys.version_info < (2,7),
+ reason="Intermittent failures on Python 2.6",
+ )
+
+ @dict_order_fails
def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env):
"""
When the egg_info section is empty or not present, running
save_version_info should add the settings to the setup.cfg
in a deterministic order, consistent with the ordering found
- on Python 2.6 and 2.7 with PYTHONHASHSEED=0.
+ on Python 2.7 with PYTHONHASHSEED=0.
"""
setup_cfg = os.path.join(env.paths['home'], 'setup.cfg')
dist = Distribution()
@@ -98,13 +104,12 @@ class TestEggInfo(object):
flags = re.MULTILINE | re.DOTALL
assert re.search(pattern, content, flags)
+ @dict_order_fails
def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
"""
When running save_version_info on an existing setup.cfg
with the 'default' values present from a previous run,
- the file should remain unchanged, except on Python 2.6,
- where the order of the keys will be changed to match the
- order as found in a dictionary of those keys.
+ the file should remain unchanged.
"""
setup_cfg = os.path.join(env.paths['home'], 'setup.cfg')
build_files({