fix tests for pkgcraft dropping support for EAPIs 0 to 4

Author: radhermit

src/pkgcraft/eapi.pyx

@@ -52,15 +52,19 @@ cdef object get_eapis():
 def eapi_range(str s not None):
     """Convert EAPI range into an ordered set of Eapi objects.
 
-    >>> from pkgcraft.eapi import eapi_range, EAPI3, EAPI4, EAPIS, EAPIS_OFFICIAL
+    >>> from pkgcraft.eapi import *
 
     >>> eapi_range('..') == set(EAPIS.values())
     True
-    >>> eapi_range('..2') == {EAPI0, EAPI1}
+    >>> eapi_range('..6') == {EAPI5}
     True
-    >>> eapi_range('3..4') == {EAPI3}
+    >>> eapi_range('..=6') == {EAPI5, EAPI6}
     True
-    >>> eapi_range('3..=4') == {EAPI3, EAPI4}
+    >>> eapi_range('7..8') == {EAPI7}
+    True
+    >>> eapi_range('8..8') == set()
+    True
+    >>> eapi_range('7..=8') == {EAPI7, EAPI8}
     True
     >>> eapi_range('..9999')
     Traceback (most recent call last):
@@ -121,18 +125,18 @@ cdef class Eapi(_IndirectInit):
     def has(self, str s not None):
         """Check if an EAPI has a given feature.
 
-        >>> from pkgcraft.eapi import EAPI5
+        >>> from pkgcraft.eapi import EAPI_LATEST_OFFICIAL
 
         existing feature
-        >>> EAPI5.has('subslots')
+        >>> EAPI_LATEST_OFFICIAL.has('usev_two_args')
         True
 
-        newer feature not existing in EAPI 5
-        >>> EAPI5.has('nonfatal_die')
+        feature not existing in official EAPIs
+        >>> EAPI_LATEST_OFFICIAL.has('repo_ids')
         False
 
         nonexistent feature
-        >>> EAPI5.has('nonexistent')
+        >>> EAPI_LATEST_OFFICIAL.has('nonexistent')
         False
         """
         return C.pkgcraft_eapi_has(self.ptr, s.encode())

testdata

@@ -4,7 +4,7 @@
 
 import pytest
 
-from pkgcraft.eapi import EAPI0, EAPI_LATEST_OFFICIAL
+from pkgcraft.eapi import EAPI_LATEST_OFFICIAL
 from pkgcraft.error import InvalidRepo
 from pkgcraft.repo import EbuildRepo, Repo
 
@@ -77,14 +77,14 @@ def test_contains_path(self, make_ebuild_repo):
         assert pkg2.path in r2
 
     def test_eapi(self, make_raw_ebuild_repo):
-        # non-present defaults to EAPI 0
+        # non-present defaults to EAPI 0 which isn't supported
         repo = make_raw_ebuild_repo(eapi=None)
-        r = EbuildRepo(repo.path)
-        assert r.eapi is EAPI0
+        with pytest.raises(InvalidRepo, match="unsupported EAPI: 0"):
+            EbuildRepo(repo.path)
 
         # invalid EAPI
         repo = make_raw_ebuild_repo(eapi="abc123")
-        with pytest.raises(InvalidRepo, match="unknown EAPI: abc123"):
+        with pytest.raises(InvalidRepo, match="unsupported EAPI: abc123"):
             EbuildRepo(repo.path)
 
         # defaults to latest EAPI

tests/repo/test_ebuild.py

@@ -2,15 +2,7 @@
 
 import pytest
 
-from pkgcraft.eapi import (
-    EAPI0,
-    EAPI1,
-    EAPI_LATEST,
-    EAPI_LATEST_OFFICIAL,
-    EAPIS,
-    EAPIS_OFFICIAL,
-    Eapi,
-)
+from pkgcraft.eapi import *
 
 from .misc import OperatorMap
 
@@ -27,40 +19,39 @@ def test_globals():
 
 class TestEapi:
     def test_has(self):
-        assert not EAPI1.has("nonexistent_feature")
-        assert EAPI1.has("slot_deps")
+        assert not EAPI_LATEST_OFFICIAL.has("repo_ids")
+        assert EAPI_LATEST.has("repo_ids")
+        assert not EAPI_LATEST.has("nonexistent_feature")
 
         # invalid feature param type
         for obj in (object(), None):
             with pytest.raises(TypeError):
-                EAPI1.has(obj)
+                EAPI_LATEST.has(obj)
 
     def test_dep_keys(self):
-        assert "DEPEND" in EAPI0.dep_keys
-        assert "BDEPEND" not in EAPI0.dep_keys
         assert "BDEPEND" in EAPI_LATEST.dep_keys
+        assert "NONEXISTENT" not in EAPI_LATEST.dep_keys
 
     def test_metadata_keys(self):
-        assert "SLOT" in EAPI0.metadata_keys
-        assert "REQUIRED_USE" not in EAPI0.metadata_keys
-        assert "REQUIRED_USE" in EAPI_LATEST.metadata_keys
+        assert "SLOT" in EAPI_LATEST.metadata_keys
+        assert "NONEXISTENT" not in EAPI_LATEST.metadata_keys
 
     def test_methods(self):
-        assert str(EAPI0) == "0"
-        assert repr(EAPI0).startswith("<Eapi '0' at 0x")
+        assert str(EAPI8) == "8"
+        assert repr(EAPI8).startswith("<Eapi '8' at 0x")
 
     def test_cmp(self):
-        assert EAPI0 < EAPI1
-        assert EAPI0 <= EAPI1
-        assert EAPI1 <= EAPI1
-        assert EAPI1 == EAPI1
-        assert EAPI0 != EAPI1
-        assert EAPI1 >= EAPI1
-        assert EAPI1 >= EAPI0
-        assert EAPI1 > EAPI0
+        assert EAPI7 < EAPI8
+        assert EAPI8 <= EAPI8
+        assert EAPI8 <= EAPI8
+        assert EAPI8 == EAPI8
+        assert EAPI7 != EAPI8
+        assert EAPI8 >= EAPI7
+        assert EAPI8 >= EAPI7
+        assert EAPI8 > EAPI7
 
         # verify incompatible type comparisons
-        obj = EAPI0
+        obj = EAPI_LATEST
         for op, op_func in OperatorMap.items():
             if op == "==":
                 assert not op_func(obj, None)
@@ -71,14 +62,14 @@ def test_cmp(self):
                     op_func(obj, None)
 
     def test_hash(self):
-        s = {EAPI0, EAPI1}
+        s = {EAPI7, EAPI8}
         assert len(s) == 2
-        s = {EAPI0, EAPI0}
+        s = {EAPI8, EAPI8}
         assert len(s) == 1
 
     def test_from_obj(self):
-        assert Eapi.from_obj(EAPI0) is EAPI0
-        assert Eapi.from_obj("0") is EAPI0
+        assert Eapi.from_obj(EAPI8) is EAPI8
+        assert Eapi.from_obj("8") is EAPI8
 
         # unknown EAPI
         with pytest.raises(ValueError):
@@ -89,6 +80,6 @@ def test_from_obj(self):
             assert Eapi.from_obj(object())
 
     def test_eapi_pickle(self):
-        e1 = EAPI0
+        e1 = EAPI8
         e2 = pickle.loads(pickle.dumps(e1))
         assert e1 is e2