tests: updates for shared test data repo renaming

Author: radhermit

testdata

@@ -36,7 +36,8 @@ def __init__(self):
 
         # load repos
         for path in sorted(glob.glob(f"{DATADIR}/repos/*")):
-            self._config.add_repo(path, id=os.path.basename(path), external=False)
+            if not path.endswith("-invalid"):
+                self._config.add_repo(path, id=os.path.basename(path), external=False)
 
         # load toml files
         self._toml = {}

tests/misc.py

@@ -99,22 +99,16 @@ def test_eapi(self, make_raw_ebuild_repo):
         assert r.eapi is EAPI_LATEST_OFFICIAL
 
     def test_masters(self):
-        # primary repo
-        primary_repo = TEST_DATA.repos["dependent-primary"]
-        assert not primary_repo.masters
-
-        # dependent repo
-        secondary_repo = TEST_DATA.repos["dependent-secondary"]
-        assert secondary_repo.masters == (primary_repo,)
+        primary = TEST_DATA.repos["primary"]
+        assert not primary.masters
+        secondary = TEST_DATA.repos["secondary"]
+        assert secondary.masters == (primary,)
 
     def test_licenses(self):
-        # primary repo
-        primary_repo = TEST_DATA.repos["dependent-primary"]
-        assert primary_repo.licenses == ["a"]
-
-        # dependent repo
-        secondary_repo = TEST_DATA.repos["dependent-secondary"]
-        assert secondary_repo.licenses == ["a", "b"]
+        primary = TEST_DATA.repos["primary"]
+        assert primary.licenses == ["a"]
+        secondary = TEST_DATA.repos["secondary"]
+        assert secondary.licenses == ["a", "b"]
 
     @pytest.mark.parallel
     def test_pkg_metadata_regen(self, tmpdir):
@@ -162,10 +156,7 @@ def test_categories(self, make_ebuild_repo):
         assert repo.metadata.categories == ["cat1", "cat2"]
 
     def test_licenses(self):
-        # primary repo
-        primary_repo = TEST_DATA.repos["dependent-primary"]
-        assert primary_repo.metadata.licenses == ["a"]
-
-        # dependent repo
-        secondary_repo = TEST_DATA.repos["dependent-secondary"]
-        assert secondary_repo.metadata.licenses == ["b"]
+        primary = TEST_DATA.repos["primary"]
+        assert primary.metadata.licenses == ["a"]
+        secondary = TEST_DATA.repos["secondary"]
+        assert secondary.metadata.licenses == ["b"]