New pylint likes 'with'

[pinch] / tests / multi-update.sh

diff --git a/tests/multi-update.sh b/tests/multi-update.sh
index cd6e90bd707acee40714af68ce4a801b37a1de22..52c59c8c34cbc94c7cde1f995e5c2733b2c55f4d 100755 (executable)
--- a/tests/multi-update.sh
+++ b/tests/multi-update.sh
@@ -7,6 +7,7 @@ foo_setup
 conf2="`mktemp`"
 cat > "$conf2" <<EOF
 [bar]
 conf2="`mktemp`"
 cat > "$conf2" <<EOF
 [bar]

+type = alias

 alias_of = foo
 EOF
 
 alias_of = foo
 EOF
 


@@ -17,7 +18,7 @@ actual_env_command=`python3 ./pinch.py update --dry-run "$conf" "$conf2"`
 
 rm -rf "$conf2"
 
 
 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_DIR"'/.{32}-\1.tar.xz"; \}'\'' '\''f: f \{ name = "\1"; channelName = "foo"; src = builtins.storePath "'"$NIX_STORE_DIR"'/.{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}-\1.tar.xz) --from-expression '\''f: f \{ name = "\1"; channelName = "bar"; src = builtins.storePath "\2"; \}'\'' '\''f: f \{ name = "\1"; channelName = "foo"; src = builtins.storePath "\2"; \}'\''$'

 
 if echo "$actual_env_command" | egrep "$expected_env_command_RE" > /dev/null;then
   echo PASS
 
 if echo "$actual_env_command" | egrep "$expected_env_command_RE" > /dev/null;then
   echo PASS