diff options
| author | Árni Dagur <arni@dagur.eu> | 2021-12-03 19:09:03 +0100 |
|---|---|---|
| committer | Árni Dagur <arni@dagur.eu> | 2021-12-03 19:33:15 +0100 |
| commit | 5fdcc4f039bbf6dc1f73a8c9b6c523857b2cd088 (patch) | |
| tree | b7b5f30486c168f59f0e3fbf8ad3d551f4f8bcd4 /tests | |
| parent | 50b2ddba9f7b237b38c848c7d4a1637917444924 (diff) | |
Fix broken version handling in test suite
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_metadata.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tests/test_metadata.py b/tests/test_metadata.py index 1a0e6d8..440d560 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py | |||
| @@ -5,10 +5,15 @@ import toml | |||
| 5 | import adblock | 5 | import adblock |
| 6 | 6 | ||
| 7 | 7 | ||
| 8 | def parse_version(version): | ||
| 9 | parts = version.split(".") | ||
| 10 | return tuple(map(int, parts)) | ||
| 11 | |||
| 12 | |||
| 8 | def get_version_value_cargo(): | 13 | def get_version_value_cargo(): |
| 9 | with open("Cargo.toml", encoding="utf-8") as f: | 14 | with open("Cargo.toml", encoding="utf-8") as f: |
| 10 | cargo_toml = toml.loads(f.read()) | 15 | cargo_toml = toml.loads(f.read()) |
| 11 | return cargo_toml["package"]["version"] | 16 | return parse_version(cargo_toml["package"]["version"]) |
| 12 | 17 | ||
| 13 | 18 | ||
| 14 | def get_version_value_changelog(): | 19 | def get_version_value_changelog(): |
| @@ -25,7 +30,7 @@ def get_version_value_changelog(): | |||
| 25 | line.strip(), | 30 | line.strip(), |
| 26 | ) | 31 | ) |
| 27 | if match is not None: | 32 | if match is not None: |
| 28 | versions.append(match.group(1)) | 33 | versions.append(parse_version(match.group(1))) |
| 29 | assert versions == sorted(versions, reverse=True) | 34 | assert versions == sorted(versions, reverse=True) |
| 30 | return versions[0] | 35 | return versions[0] |
| 31 | 36 | ||
| @@ -37,14 +42,14 @@ def test_version_numbers_all_same(): | |||
| 37 | """ | 42 | """ |
| 38 | cargo_version = get_version_value_cargo() | 43 | cargo_version = get_version_value_cargo() |
| 39 | changelog_version = get_version_value_changelog() | 44 | changelog_version = get_version_value_changelog() |
| 40 | module_version = adblock.__version__ | 45 | module_version = parse_version(adblock.__version__) |
| 41 | 46 | ||
| 42 | assert cargo_version == module_version | 47 | assert cargo_version == module_version |
| 43 | assert module_version == changelog_version | 48 | assert module_version == changelog_version |
| 44 | 49 | ||
| 45 | 50 | ||
| 46 | def get_current_python_version(): | 51 | def get_current_python_version(): |
| 47 | return f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}" | 52 | return (sys.version_info.major, sys.version_info.minor, sys.version_info.micro) |
| 48 | 53 | ||
| 49 | 54 | ||
| 50 | def test_required_python_version(): | 55 | def test_required_python_version(): |
| @@ -58,4 +63,4 @@ def test_required_python_version(): | |||
| 58 | required_python = cargo_toml["package"]["metadata"]["maturin"]["requires-python"] | 63 | required_python = cargo_toml["package"]["metadata"]["maturin"]["requires-python"] |
| 59 | assert required_python.startswith(">=") | 64 | assert required_python.startswith(">=") |
| 60 | required_python = required_python[2:] | 65 | required_python = required_python[2:] |
| 61 | assert get_current_python_version() >= required_python | 66 | assert get_current_python_version() >= parse_version(required_python) |
