Skip to content

Commit b596e4d

Browse files
committed
Run cache tests separately and last
They modify globals and impact other runs in same process, so run them separately in Ci and restore empty globals at end of tests. Run them last (renamed with zzzz) Signed-off-by: Philippe Ombredanne <[email protected]>
1 parent fad9199 commit b596e4d

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ env:
1414
- TEST_SUITE="$PYTEST --ignore=tests/scancode --ignore=tests/extractcode --ignore=tests/licensedcode --ignore=tests/cluecode --ignore=tests/packagedcode"
1515
- TEST_SUITE="$PYTEST tests/scancode"
1616
- TEST_SUITE="$PYTEST tests/extractcode"
17-
- TEST_SUITE="$PYTEST tests/licensedcode"
17+
- TEST_SUITE="$PYTEST tests/licensedcode --ignore=tests/licensedcode/test_zzzz_cache.py"
18+
- TEST_SUITE="$PYTEST tests/licensedcode/test_zzzz_cache.py"
1819
- TEST_SUITE="$PYTEST tests/cluecode"
1920
- TEST_SUITE="$PYTEST tests/packagedcode"
2021
- TEST_SUITE="./etc/release/release.sh"

appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ environment:
55
- TEST_SUITE: "py.test -n 2 -vvs --ignore=tests/scancode --ignore=tests/extractcode --ignore=tests/licensedcode --ignore=tests/cluecode --ignore=tests/packagedcode"
66
- TEST_SUITE: "py.test -n 2 -vvs tests/scancode"
77
- TEST_SUITE: "py.test -n 2 -vvs tests/extractcode"
8-
- TEST_SUITE: "py.test -n 2 -s tests/licensedcode"
8+
- TEST_SUITE: "py.test -n 2 -s tests/licensedcode --ignore=tests/licensedcode/test_zzzz_cache.py"
9+
- TEST_SUITE: "py.test -s tests/licensedcode/test_zzzz_cache.py"
910
- TEST_SUITE: "py.test -n 2 -s tests/cluecode"
1011
- TEST_SUITE: "py.test -n 2 -s tests/packagedcode"
1112

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,12 @@ def test_build_index(self):
206206
assert tree_before == open(checksum_file).read()
207207
assert os.path.exists(cache_file)
208208

209+
# reset tests caches
210+
cache._LICENSE_SYMBOLS_BY_SPDX_KEY = {}
211+
cache._LICENSES_BY_KEY_INDEX = None
212+
cache._UNKNOWN_SPDX_SYMBOL = None
213+
cache._LICENSES_BY_KEY = None
214+
209215
def test__load_index(self):
210216
cache_dir = self.get_temp_dir('index_cache')
211217

@@ -232,3 +238,9 @@ def test__load_index(self):
232238

233239
idx2 = cache.load_index(cache_file)
234240
assert idx1.to_dict(True) == idx2.to_dict(True)
241+
242+
# reset tests caches
243+
cache._LICENSE_SYMBOLS_BY_SPDX_KEY = {}
244+
cache._LICENSES_BY_KEY_INDEX = None
245+
cache._UNKNOWN_SPDX_SYMBOL = None
246+
cache._LICENSES_BY_KEY = None

0 commit comments

Comments
 (0)