X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/a2290fb189bee1da5e985d785e044d1681401ff7..352cba96de3b4cd138ead4a765756fb169f40fe5:/tests/multi-update.sh

diff --git a/tests/multi-update.sh b/tests/multi-update.sh
index d6a6d54..5d191ec 100755
--- a/tests/multi-update.sh
+++ b/tests/multi-update.sh
@@ -7,6 +7,7 @@ foo_setup
 conf2="`mktemp`"
 cat > "$conf2" <<EOF
 [bar]
+type = alias
 alias_of = foo
 EOF
 
@@ -15,10 +16,9 @@ python3 ./pinch.py pin "$conf2"
 
 actual_env_command=`python3 ./pinch.py update --dry-run "$conf" "$conf2"`
 
-foo_cleanup
 rm -rf "$conf2"
 
-expected_env_command_RE='^nix-env --profile /nix/var/nix/profiles/per-user/[^/]+/channels --show-trace --file '\''<nix/unpack-channel.nix>'\'' --install --from-expression '\''f: f \{ name = "(repo-[0-9]{10}-[0-9a-f]{11})"; channelName = "bar"; src = builtins.storePath "/nix/store/.{32}-\1.tar.xz"; \}'\'' '\''f: f \{ name = "\1"; channelName = "foo"; src = builtins.storePath "/nix/store/.{32}-\1.tar.xz"; \}'\''$'
+expected_env_command_RE='^nix-env --profile /nix/var/nix/profiles/per-user/[^/]+/channels --show-trace --file '\''<nix/unpack-channel.nix>'\'' --install --remove-all (-I pinch_profile=/nix/var/nix/profiles/per-user/[^/]+/channels -I pinch_profile_manifest=/nix/store/.{32}-env-manifest.nix )?-I pinch_tarball_for_(repo-[0-9]{10}-[0-9a-f]{11})=('"$NIX_STORE_DIR"'/.{32}-\2.tar.xz) --from-expression '\''f: f \{ name = "\2"; channelName = "bar"; src = builtins.storePath "\3"; \}'\'' '\''f: f \{ name = "\2"; channelName = "foo"; src = builtins.storePath "\3"; \}'\''$'
 
 if echo "$actual_env_command" | egrep "$expected_env_command_RE" > /dev/null;then
   echo PASS