Merge branch 'master' into pedrolamas/ignore-board-release

python-distro · Mar 11, 2023 · 4a04a0c · 4a04a0c
2 parents 45711d1 + 40ecdd9
commit 4a04a0c
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 0 deletions.
diff --git a/src/distro/distro.py b/src/distro/distro.py
@@ -125,6 +125,7 @@ class InfoDict(TypedDict):
 # Base file names to be looked up for if _UNIXCONFDIR is not readable.
 _DISTRO_RELEASE_BASENAMES = [
     "SuSE-release",
+    "altlinux-release",
     "arch-release",
     "base-release",
     "centos-release",
@@ -244,6 +245,7 @@ def id() -> str:
     "rocky"         Rocky Linux
     "aix"           AIX
     "guix"          Guix System
+    "altlinux"      ALT Linux
     ==============  =========================================
 
     If you have a need to get distros for reliable IDs added into this set,

diff --git a/tests/resources/distros/altlinux10/etc/altlinux-release b/tests/resources/distros/altlinux10/etc/altlinux-release
@@ -0,0 +1 @@
+ALT Server 10.1 (Mendelevium)
diff --git a/tests/resources/distros/altlinux10/etc/fedora-release b/tests/resources/distros/altlinux10/etc/fedora-release
@@ -0,0 +1 @@
+altlinux-release
diff --git a/tests/resources/distros/altlinux10/etc/os-release b/tests/resources/distros/altlinux10/etc/os-release
@@ -0,0 +1,10 @@
+NAME="ALT Server"
+VERSION="10.1"
+ID=altlinux
+VERSION_ID=10.1
+PRETTY_NAME="ALT Server 10.1 (Mendelevium)"
+ANSI_COLOR="1;33"
+CPE_NAME="cpe:/o:alt:server:10.1"
+BUILD_ID="ALT Server 10.1"
+HOME_URL="https://basealt.ru/"
+BUG_REPORT_URL="https://bugs.altlinux.org/"
diff --git a/tests/resources/distros/altlinux10/etc/redhat-release b/tests/resources/distros/altlinux10/etc/redhat-release
@@ -0,0 +1 @@
+altlinux-release
diff --git a/tests/resources/distros/altlinux10/etc/system-release b/tests/resources/distros/altlinux10/etc/system-release
@@ -0,0 +1 @@
+altlinux-release
diff --git a/tests/test_distro.py b/tests/test_distro.py
@@ -509,6 +509,19 @@ def test_cloudlinux7_os_release(self) -> None:
         }
         self._test_outcome(desired_outcome)
 
+    def test_altlinux10_os_release(self) -> None:
+        desired_outcome = {
+            "id": "altlinux",
+            "name": "ALT Server",
+            "pretty_name": "ALT Server 10.1 (Mendelevium)",
+            "version": "10.1",
+            "pretty_version": "10.1",
+            "best_version": "10.1",
+            "major_version": "10",
+            "minor_version": "1",
+        }
+        self._test_outcome(desired_outcome)
+
     def test_bttcb1_os_release(self) -> None:
         desired_outcome = {
             "id": "debian",
@@ -1095,6 +1108,20 @@ def test_cloudlinux7_dist_release(self) -> None:
         }
         self._test_outcome(desired_outcome, "cloudlinux", "7", "redhat")
 
+    def test_altlinux10_dist_release(self) -> None:
+        desired_outcome = {
+            "id": "altlinux",
+            "name": "ALT Server",
+            "codename": "Mendelevium",
+            "pretty_name": "ALT Server 10.1 (Mendelevium)",
+            "version": "10.1",
+            "pretty_version": "10.1 (Mendelevium)",
+            "best_version": "10.1",
+            "major_version": "10",
+            "minor_version": "1",
+        }
+        self._test_outcome(desired_outcome, "altlinux", "10")
+
 
 @pytest.mark.skipif(not IS_LINUX, reason="Irrelevant on non-linux")
 class TestOverall(DistroTestCase):
@@ -1844,6 +1871,28 @@ def test_cloudlinux7_release(self) -> None:
         }
         self._test_outcome(desired_outcome)
 
+    def test_altlinux10_release(self) -> None:
+        desired_outcome = {
+            "id": "altlinux",
+            "name": "ALT Server",
+            "codename": "Mendelevium",
+            "pretty_name": "ALT Server 10.1 (Mendelevium)",
+            "version": "10.1",
+            "pretty_version": "10.1 (Mendelevium)",
+            "best_version": "10.1",
+            "major_version": "10",
+            "minor_version": "1",
+        }
+        self._test_outcome(desired_outcome)
+
+        desired_info = {
+            "id": "altlinux",
+            "name": "ALT Server",
+            "version_id": "10.1",
+            "codename": "Mendelevium",
+        }
+        self._test_release_file_info("altlinux-release", desired_info)
+
 
 def _bad_os_listdir(path: str = ".") -> NoReturn:
     """This function is used by TestOverallWithEtcNotReadable to simulate