@@ -24,17 +24,15 @@ namespace
24
24
auto pkg_info = specs::PackageInfo::from_url (url).value ();
25
25
26
26
PackageFetcher pkg_fetcher{ pkg_info, package_caches };
27
- REQUIRE (pkg_fetcher.name () == " pkg " );
27
+ REQUIRE (pkg_fetcher.name () == pkg_info. name );
28
28
29
29
auto req = pkg_fetcher.build_download_request ();
30
30
// Should correspond to package name
31
- REQUIRE (req.name == " pkg " );
31
+ REQUIRE (req.name == pkg_info. name );
32
32
// Should correspond to PackageFetcher::channel()
33
33
REQUIRE (req.mirror_name == " " );
34
34
// Should correspond to PackageFetcher::url_path()
35
- REQUIRE (
36
- req.url_path == " https://conda.anaconda.org/conda-forge/linux-64/pkg-6.4-bld.conda"
37
- );
35
+ REQUIRE (req.url_path == url);
38
36
}
39
37
40
38
SECTION (" From some mirror" )
@@ -43,18 +41,15 @@ namespace
43
41
auto pkg_info = specs::PackageInfo::from_url (url).value ();
44
42
45
43
PackageFetcher pkg_fetcher{ pkg_info, package_caches };
46
- REQUIRE (pkg_fetcher.name () == " cpp-tabulate " );
44
+ REQUIRE (pkg_fetcher.name () == pkg_info. name );
47
45
48
46
auto req = pkg_fetcher.build_download_request ();
49
47
// Should correspond to package name
50
- REQUIRE (req.name == " cpp-tabulate " );
48
+ REQUIRE (req.name == pkg_info. name );
51
49
// Should correspond to PackageFetcher::channel()
52
50
REQUIRE (req.mirror_name == " " );
53
51
// Should correspond to PackageFetcher::url_path()
54
- REQUIRE (
55
- req.url_path
56
- == " https://repo.prefix.dev/emscripten-forge-dev/emscripten-wasm32/cpp-tabulate-1.5.0-h7223423_2.tar.bz2"
57
- );
52
+ REQUIRE (req.url_path == url);
58
53
}
59
54
60
55
SECTION (" From local file" )
@@ -63,15 +58,15 @@ namespace
63
58
auto pkg_info = specs::PackageInfo::from_url (url).value ();
64
59
65
60
PackageFetcher pkg_fetcher{ pkg_info, package_caches };
66
- REQUIRE (pkg_fetcher.name () == " xtensor " );
61
+ REQUIRE (pkg_fetcher.name () == pkg_info. name );
67
62
68
63
auto req = pkg_fetcher.build_download_request ();
69
64
// Should correspond to package name
70
- REQUIRE (req.name == " xtensor " );
65
+ REQUIRE (req.name == pkg_info. name );
71
66
// Should correspond to PackageFetcher::channel()
72
67
REQUIRE (req.mirror_name == " " );
73
68
// Should correspond to PackageFetcher::url_path()
74
- REQUIRE (req.url_path == " file:///home/wolfv/Downloads/xtensor-0.21.4-hc9558a2_0.tar.bz2 " );
69
+ REQUIRE (req.url_path == url );
75
70
}
76
71
77
72
SECTION (" From oci" )
@@ -80,11 +75,11 @@ namespace
80
75
auto pkg_info = specs::PackageInfo::from_url (url).value ();
81
76
82
77
PackageFetcher pkg_fetcher{ pkg_info, package_caches };
83
- REQUIRE (pkg_fetcher.name () == " xtensor " );
78
+ REQUIRE (pkg_fetcher.name () == pkg_info. name );
84
79
85
80
auto req = pkg_fetcher.build_download_request ();
86
81
// Should correspond to package name
87
- REQUIRE (req.name == " xtensor " );
82
+ REQUIRE (req.name == pkg_info. name );
88
83
// Should correspond to PackageFetcher::channel()
89
84
REQUIRE (req.mirror_name == " oci://ghcr.io/channel-mirrors/conda-forge" );
90
85
// Should correspond to PackageFetcher::url_path()
0 commit comments