aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorjade <lix@jade.fyi>2024-06-25 10:19:52 +0000
committerGerrit Code Review <gerrit@localhost>2024-06-25 10:19:52 +0000
commitc097ebe66bf474da886ffa20d2f31bdb1d2196a8 (patch)
treed7c63500fa1a2d6e3c446246778b6595f1e35bb2 /tests
parentd5637ee790799ffa00bcaa3067bb6940b6cbad16 (diff)
parent3e151d4d77b5296b9da8c3ad209932d1dfa44c68 (diff)
Merge "Revert "libfetchers: make attribute / URL query handling consistent"" into main
Diffstat (limited to 'tests')
-rw-r--r--tests/functional/fetchers.sh91
-rw-r--r--tests/functional/meson.build1
-rw-r--r--tests/nixos/tarball-flakes.nix2
3 files changed, 1 insertions, 93 deletions
diff --git a/tests/functional/fetchers.sh b/tests/functional/fetchers.sh
deleted file mode 100644
index 0f888dc33..000000000
--- a/tests/functional/fetchers.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-source common.sh
-
-requireGit
-
-clearStore
-
-testFetchTreeError() {
- rawFetchTreeArg="${1?fetchTree arg missing}"
- messageSubstring="${2?messageSubstring missing}"
-
- output="$(nix eval --impure --raw --expr "(builtins.fetchTree $rawFetchTreeArg).outPath" 2>&1)" && status=0 || status=$?
- grepQuiet "$messageSubstring" <<<"$output"
- test "$status" -ne 0
-}
-
-# github/gitlab/sourcehut fetcher input validation
-for provider in github gitlab sourcehut; do
- # ref/rev validation
- testFetchTreeError \
- "{ type = \"$provider\"; owner = \"foo\"; repo = \"bar\"; ref = \",\"; }" \
- "URL '$provider:foo/bar' contains an invalid branch/tag name"
-
- testFetchTreeError \
- "\"$provider://host/foo/bar/,\"" \
- "URL '$provider:foo/bar', ',' is not a commit hash or a branch/tag name"
-
- testFetchTreeError \
- "\"$provider://host/foo/bar/f16d8f43dd0998cdb315a2cccf2e4d10027e7ca4?rev=abc\"" \
- "URL '$provider://host/foo/bar/f16d8f43dd0998cdb315a2cccf2e4d10027e7ca4?rev=abc' already contains a ref or rev"
-
- testFetchTreeError \
- "\"$provider://host/foo/bar/ref?ref=ref2\"" \
- "URL '$provider://host/foo/bar/ref?ref=ref2' already contains a ref or rev"
-
- # host validation
- testFetchTreeError \
- "{ type = \"$provider\"; owner = \"foo\"; repo = \"bar\"; host = \"git_hub.com\"; }" \
- "URL '$provider:foo/bar' contains an invalid instance host"
-
- testFetchTreeError \
- "\"$provider://host/foo/bar/ref?host=git_hub.com\"" \
- "URL '$provider:foo/bar' contains an invalid instance host"
-
- # invalid attributes
- testFetchTreeError \
- "{ type = \"$provider\"; owner = \"foo\"; repo = \"bar\"; wrong = true; }" \
- "unsupported input attribute 'wrong'"
-
- testFetchTreeError \
- "\"$provider://host/foo/bar/ref?wrong=1\"" \
- "unsupported input attribute 'wrong'"
-done
-
-# unsupported attributes w/ tarball fetcher
-testFetchTreeError \
- "\"https://host/foo?wrong=1\"" \
- "unsupported tarball input attribute 'wrong'. If you wanted to fetch a tarball with a query parameter, please use '{ type = \"tarball\"; url = \"...\"; }"
-
-# test for unsupported attributes / validation in git fetcher
-testFetchTreeError \
- "\"git+https://github.com/owner/repo?invalid=1\"" \
- "unsupported Git input attribute 'invalid'"
-
-testFetchTreeError \
- "\"git+https://github.com/owner/repo?url=foo\"" \
- "URL 'git+https://github.com/owner/repo?url=foo' must not override url via query param!"
-
-testFetchTreeError \
- "\"git+https://github.com/owner/repo?ref=foo.lock\"" \
- "invalid Git branch/tag name 'foo.lock'"
-
-testFetchTreeError \
- "{ type = \"git\"; url =\"https://github.com/owner/repo\"; ref = \"foo.lock\"; }" \
- "invalid Git branch/tag name 'foo.lock'"
-
-# same for mercurial
-testFetchTreeError \
- "\"hg+https://forge.tld/owner/repo?invalid=1\"" \
- "unsupported Mercurial input attribute 'invalid'"
-
-testFetchTreeError \
- "{ type = \"hg\"; url = \"https://forge.tld/owner/repo\"; invalid = 1; }" \
- "unsupported Mercurial input attribute 'invalid'"
-
-testFetchTreeError \
- "\"hg+https://forge.tld/owner/repo?ref=,\"" \
- "invalid Mercurial branch/tag name ','"
-
-testFetchTreeError \
- "{ type = \"hg\"; url = \"https://forge.tld/owner/repo\"; ref = \",\"; }" \
- "invalid Mercurial branch/tag name ','"
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index f1c97f996..eede1834c 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -93,7 +93,6 @@ functional_tests_scripts = [
'fetchGitRefs.sh',
'gc-runtime.sh',
'tarball.sh',
- 'fetchers.sh',
'fetchGit.sh',
'fetchurl.sh',
'fetchPath.sh',
diff --git a/tests/nixos/tarball-flakes.nix b/tests/nixos/tarball-flakes.nix
index 5deba4a12..ca7627bd1 100644
--- a/tests/nixos/tarball-flakes.nix
+++ b/tests/nixos/tarball-flakes.nix
@@ -69,7 +69,7 @@ in
# Check that we got redirected to the immutable URL.
locked_url = info["locked"]["url"]
- assert locked_url == "http://localhost/stable/${nixpkgs.rev}.tar.gz?rev=${nixpkgs.rev}&revCount=1234", f"{locked_url=} != http://localhost/stable/${nixpkgs.rev}.tar.gz"
+ assert locked_url == "http://localhost/stable/${nixpkgs.rev}.tar.gz", f"{locked_url=} != http://localhost/stable/${nixpkgs.rev}.tar.gz"
# Check that we got the rev and revCount attributes.
revision = info["revision"]