Skip to content

Commit 55258e1

Browse files
committed
have special assertions for pre releases
1 parent a2d979e commit 55258e1

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

tests/toolchains/defs.bzl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ def define_toolchain_tests(name):
4141

4242
parsed = version.parse(python_version, strict = True)
4343
expect_python_version = "{0}.{1}.{2}".format(*parsed.release)
44+
if parsed.pre:
45+
expect_python_version = "{0}{1}{2}".format(
46+
expect_python_version,
47+
*parsed.pre
48+
)
4449
py_reconfig_test(
4550
name = "python_{}_test".format(python_version),
4651
srcs = ["python_toolchain_test.py"],

tests/toolchains/python_toolchain_test.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
import pathlib
44
import pprint
55
import sys
6-
import textwrap
76
import unittest
87

9-
print("PYTHONPATH is:")
10-
print(textwrap.indent("\n".join(sys.path), prefix=" " * 4))
118
from python.runfiles import runfiles
129

1310

@@ -30,7 +27,18 @@ def test_expected_toolchain_matches(self):
3027
)
3128
self.assertIn(expected, settings["toolchain_label"], msg)
3229

33-
actual = "{v.major}.{v.minor}.{v.micro}".format(v=sys.version_info)
30+
if sys.version_info.releaselevel == "final":
31+
actual = "{v.major}.{v.minor}.{v.micro}".format(v=sys.version_info)
32+
elif sys.version_info.releaselevel in ["beta"]:
33+
actual = (
34+
"{v.major}.{v.minor}.{v.micro}{v.releaselevel[0]}{v.serial}".format(
35+
v=sys.version_info
36+
)
37+
)
38+
else:
39+
raise NotImplementedError(
40+
"Unsupported release level, please update the test"
41+
)
3442
self.assertEqual(actual, expect_version)
3543

3644

0 commit comments

Comments
 (0)