| 1 | Fix tests that are "hard coded" to expect x86_64 output by mocking the platform interface.
|
| 2 |
|
| 3 | Submitted upstream:
|
| 4 | https://github.com/pypa/packaging/pull/176
|
| 5 |
|
| 6 | diff --git a/tests/test_tags.py b/tests/test_tags.py
|
| 7 | index 1eacf68..0a3f1b4 100644
|
| 8 | |
| 9 | |
| 10 | @@ -435,37 +435,43 @@ class TestManylinuxPlatform:
|
| 11 | linux_platform = list(tags._linux_platforms(is_32bit=False))
|
| 12 | assert linux_platform == ["linux_x86_64"]
|
| 13 |
|
| 14 | - def test_linux_platforms_manylinux1(self, monkeypatch):
|
| 15 | + def test_linux_platforms_manylinux1(self, is_x86, monkeypatch):
|
| 16 | monkeypatch.setattr(
|
| 17 | tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux1"
|
| 18 | )
|
| 19 | - if platform.system() != "Linux":
|
| 20 | + if platform.system() != "Linux" or not is_x86:
|
| 21 | monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64")
|
| 22 | + monkeypatch.setattr(platform, "machine", lambda: "x86_64")
|
| 23 | platforms = list(tags._linux_platforms(is_32bit=False))
|
| 24 | - assert platforms == ["manylinux1_x86_64", "linux_x86_64"]
|
| 25 | + arch = platform.machine()
|
| 26 | + assert platforms == ["manylinux1_" + arch, "linux_" + arch]
|
| 27 |
|
| 28 | - def test_linux_platforms_manylinux2010(self, monkeypatch):
|
| 29 | + def test_linux_platforms_manylinux2010(self, is_x86, monkeypatch):
|
| 30 | monkeypatch.setattr(
|
| 31 | tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux2010"
|
| 32 | )
|
| 33 | - if platform.system() != "Linux":
|
| 34 | + if platform.system() != "Linux" or not is_x86:
|
| 35 | monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64")
|
| 36 | + monkeypatch.setattr(platform, "machine", lambda: "x86_64")
|
| 37 | platforms = list(tags._linux_platforms(is_32bit=False))
|
| 38 | - expected = ["manylinux2010_x86_64", "manylinux1_x86_64", "linux_x86_64"]
|
| 39 | + arch = platform.machine()
|
| 40 | + expected = ["manylinux2010_" + arch, "manylinux1_" + arch, "linux_" + arch]
|
| 41 | assert platforms == expected
|
| 42 |
|
| 43 | - def test_linux_platforms_manylinux2014(self, monkeypatch):
|
| 44 | + def test_linux_platforms_manylinux2014(self, is_x86, monkeypatch):
|
| 45 | monkeypatch.setattr(
|
| 46 | tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux2014"
|
| 47 | )
|
| 48 | - if platform.system() != "Linux":
|
| 49 | + if platform.system() != "Linux" or not is_x86:
|
| 50 | monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64")
|
| 51 | + monkeypatch.setattr(platform, "machine", lambda: "x86_64")
|
| 52 | platforms = list(tags._linux_platforms(is_32bit=False))
|
| 53 | + arch = platform.machine()
|
| 54 | expected = [
|
| 55 | - "manylinux2014_x86_64",
|
| 56 | - "manylinux2010_x86_64",
|
| 57 | - "manylinux1_x86_64",
|
| 58 | - "linux_x86_64",
|
| 59 | + "manylinux2014_" + arch,
|
| 60 | + "manylinux2010_" + arch,
|
| 61 | + "manylinux1_" + arch,
|
| 62 | + "linux_" + arch,
|
| 63 | ]
|
| 64 | assert platforms == expected
|
| 65 |
|