Skip to content

Commit

Permalink
Test fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dwoz committed Mar 25, 2024
1 parent f6f4abb commit 1f28dbb
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
4 changes: 2 additions & 2 deletions relenv/build/darwin.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def build_python(env, dirs, logfp):
runcmd(["make", "install"], env=env, stderr=logfp, stdout=logfp)


build = builds.add("darwin", populate_env=populate_env, version="3.10.13")
build = builds.add("darwin", populate_env=populate_env, version="3.10.14")

build.add(
"openssl",
Expand Down Expand Up @@ -116,7 +116,7 @@ def build_python(env, dirs, logfp):
download={
"url": "https://www.python.org/ftp/python/{version}/Python-{version}.tar.xz",
"fallback_url": "https://woz.io/relenv/dependencies/Python-{version}.tar.gz",
"md5sum": "8847dc6458d1431d0ae0f55942deeb89",
"md5sum": "05148354ce821ba7369e5b7958435400",
"version": build.version,
},
)
Expand Down
18 changes: 15 additions & 3 deletions tests/test_verify_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -1138,10 +1138,24 @@ def test_install_with_target_scripts(pipexec, build, minor_version):


@pytest.mark.skip_unless_on_linux
def test_install_with_target_namespaces(pipexec, build, minor_version):
def test_install_with_target_namespaces(pipexec, build, minor_version, build_version):
env = os.environ.copy()
os.chdir(build)
env["RELENV_DEBUG"] = "yes"

if "3.12" in build_version or "3.11" in build_version:
subprocess.run(
[
str(pipexec),
"install",
"cython",
"-v",
"--no-build-isolation",
],
check=True,
env=env,
)

extras = build / "extras"
subprocess.run(
[
Expand All @@ -1154,7 +1168,6 @@ def test_install_with_target_namespaces(pipexec, build, minor_version):
],
check=True,
env=env,
capture_output=True,
)
assert (extras / "saltext" / "vmware").exists()
subprocess.run(
Expand All @@ -1167,7 +1180,6 @@ def test_install_with_target_namespaces(pipexec, build, minor_version):
],
check=True,
env=env,
capture_output=True,
)
assert (extras / "saltext" / "bitwarden").exists()

Expand Down

0 comments on commit 1f28dbb

Please sign in to comment.