aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorThéophane Hufschmitt <regnat@users.noreply.github.com>2021-12-17 10:05:48 +0100
committerGitHub <noreply@github.com>2021-12-17 10:05:48 +0100
commit23ea1e46cc4831dd13915a2d7acd9f04696b6dcc (patch)
tree5ad0443314030e7bcc5d27cc35e19c7c51e317c3 /tests
parentc260640dec6e35c714b666a1e7adede5aab6972a (diff)
parent6f1b3d711e6174286ae8ecb83c5d8a348e9fa2c3 (diff)
Merge pull request #5047 from symphorien/fix-nix-channel
nix-channel: use nix-env -i --remove-all to upgrade
Diffstat (limited to 'tests')
-rw-r--r--tests/nix-channel.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/nix-channel.sh b/tests/nix-channel.sh
index 63c0f97ba..54b8f5979 100644
--- a/tests/nix-channel.sh
+++ b/tests/nix-channel.sh
@@ -35,16 +35,14 @@ grep -q 'item.*attrPath="foo".*name="dependencies-top"' $TEST_ROOT/meta.xml
nix-env -i dependencies-top
[ -e $TEST_HOME/.nix-profile/foobar ]
-clearProfiles
-rm -f $TEST_HOME/.nix-channels
-
# Test updating from a tarball
-nix-channel --add file://$TEST_ROOT/foo/nixexprs.tar.bz2 foo
+nix-channel --add file://$TEST_ROOT/foo/nixexprs.tar.bz2 bar
nix-channel --update
# Do a query.
nix-env -qa \* --meta --xml --out-path > $TEST_ROOT/meta.xml
grep -q 'meta.*description.*Random test package' $TEST_ROOT/meta.xml
+grep -q 'item.*attrPath="bar".*name="dependencies-top"' $TEST_ROOT/meta.xml
grep -q 'item.*attrPath="foo".*name="dependencies-top"' $TEST_ROOT/meta.xml
# Do an install.