diff options
| author | David Hows <howsdav@gmail.com> | 2016-07-14 12:59:28 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-07-14 12:59:28 +1000 |
| commit | 2c5343e7b9c81167fc0b8e3e14b2395d55afa5a8 (patch) | |
| tree | 913edf6588cc6f39a651365cf8ff177dd81f5973 | |
| parent | 505da558248706e264d3f96421194497396a2ede (diff) | |
| download | mongo-2c5343e7b9c81167fc0b8e3e14b2395d55afa5a8.tar.gz | |
WT-2763 Change test ID's in test_intpack to fix OSX test errors (#2872)
OS X does case insensitive naming, which causes problems for parallel test suite. Update int packing tests to have unique names, and enforce case in-sensitive uniqueness in check_scenarios.
| -rw-r--r-- | test/suite/test_intpack.py | 30 | ||||
| -rw-r--r-- | test/suite/wtscenario.py | 4 |
2 files changed, 20 insertions, 14 deletions
diff --git a/test/suite/test_intpack.py b/test/suite/test_intpack.py index 187b2d7f579..7c499ded407 100644 --- a/test/suite/test_intpack.py +++ b/test/suite/test_intpack.py @@ -126,20 +126,26 @@ class PackTester: class test_intpack(wttest.WiredTigerTestCase): name = 'test_intpack' + # We have to be a bit verbose here with naming, as there can be problems with + # case insensitive test names:w + scenarios = check_scenarios([ - ('b', dict(formatcode='b', low=-128, high=127, nbits=8)), - ('B', dict(formatcode='B', low=0, high=255, nbits=8)), - ('8t', dict(formatcode='8t', low=0, high=255, nbits=8)), - ('5t', dict(formatcode='5t', low=0, high=31, nbits=5)), - ('h', dict(formatcode='h', low=-32768, high=32767, nbits=16)), - ('H', dict(formatcode='H', low=0, high=65535, nbits=16)), - ('i', dict(formatcode='i', low=-2147483648, high=2147483647, nbits=32)), - ('I', dict(formatcode='I', low=0, high=4294967295, nbits=32)), - ('l', dict(formatcode='l', low=-2147483648, high=2147483647, nbits=32)), - ('L', dict(formatcode='L', low=0, high=4294967295, nbits=32)), - ('q', dict(formatcode='q', low=-9223372036854775808, + ('int8_t_b', dict(formatcode='b', low=-128, high=127, nbits=8)), + ('uint8_t_B', dict(formatcode='B', low=0, high=255, nbits=8)), + ('fix_len_8t', dict(formatcode='8t', low=0, high=255, nbits=8)), + ('fix_len_5t', dict(formatcode='5t', low=0, high=31, nbits=5)), + ('int16_t_h', dict(formatcode='h', low=-32768, high=32767, nbits=16)), + ('uint16_t_H', dict(formatcode='H', low=0, high=65535, nbits=16)), + ('int32_t_i', dict(formatcode='i', low=-2147483648, high=2147483647, + nbits=32)), + ('uint32_t_I', dict(formatcode='I', low=0, high=4294967295, nbits=32)), + ('int32_t_l', dict(formatcode='l', low=-2147483648, high=2147483647, + nbits=32)), + ('uint32_t_L', dict(formatcode='L', low=0, high=4294967295, nbits=32)), + ('int64_t_q', dict(formatcode='q', low=-9223372036854775808, high=9223372036854775807, nbits=64)), - ('Q', dict(formatcode='Q', low=0, high=18446744073709551615, nbits=64)), + ('uint64_t_Q', dict(formatcode='Q', low=0, high=18446744073709551615, + nbits=64)), ]) scenarios = check_scenarios(number_scenarios(scenarios)) diff --git a/test/suite/wtscenario.py b/test/suite/wtscenario.py index 7fad7c228fb..e273caf5325 100644 --- a/test/suite/wtscenario.py +++ b/test/suite/wtscenario.py @@ -66,9 +66,9 @@ megabyte = 1024 * 1024 def check_scenarios(scenes): """ - Make sure all scenarios have unique names + Make sure all scenarios have unique case insensitive names """ - assert len(scenes) == len(dict(scenes)) + assert len(scenes) == len(dict((k.lower(), v) for k, v in scenes)) return scenes def multiply_scenarios(sep, *args): |