zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make url_fetch tests work on Windows (#44809)

Browse Source
This commit is contained in:
Nicole C
2024-06-25 03:34:11 -04:00
committed by GitHub
parent 99e3fdb180
commit d8b0df6f5b
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/spack/spack/test/url_fetch.py
View File

@@ -173,8 +173,6 @@ def test_fetch(
assert "echo Building..." in contents assert "echo Building..." in contents
# TODO-27021
@pytest.mark.not_on_windows("Not supported on Windows (yet)")
@pytest.mark.parametrize( @pytest.mark.parametrize(
"spec,url,digest", "spec,url,digest",
[ [
@@ -205,7 +203,6 @@ def test_from_list_url(mock_packages, config, spec, url, digest, _fetch_method):
assert fetch_strategy.extra_options == {"timeout": 60} assert fetch_strategy.extra_options == {"timeout": 60}
@pytest.mark.not_on_windows("Not supported on Windows (yet)")
@pytest.mark.parametrize("_fetch_method", ["curl", "urllib"]) @pytest.mark.parametrize("_fetch_method", ["curl", "urllib"])
@pytest.mark.parametrize( @pytest.mark.parametrize(
"requested_version,tarball,digest", "requested_version,tarball,digest",

5
var/spack/repos/builtin.mock/packages/url-list-test/package.py
View File

@@ -5,6 +5,7 @@
import spack.paths import spack.paths
from spack.package import * from spack.package import *
from spack.util.url import path_to_file_url
class UrlListTest(Package): class UrlListTest(Package):
@@ -13,8 +14,8 @@ class UrlListTest(Package):
homepage = "http://www.url-list-example.com" homepage = "http://www.url-list-example.com"
web_data_path = join_path(spack.paths.test_path, "data", "web") web_data_path = join_path(spack.paths.test_path, "data", "web")
url = "file://" + web_data_path + "/foo-0.0.0.tar.gz" url = path_to_file_url(join_path(spack.paths.test_path, "data", "web") + "/foo-0.0.0.tar.gz")
list_url = "file://" + web_data_path + "/index.html" list_url = path_to_file_url(join_path(spack.paths.test_path, "data", "web") + "/index.html")
list_depth = 3 list_depth = 3
version("0.0.0", md5="00000000000000000000000000000000") version("0.0.0", md5="00000000000000000000000000000000")