diff --git a/pkgs/racket-test/tests/pkg/tests-failure.rkt b/pkgs/racket-test/tests/pkg/tests-failure.rkt index 50b32a4742..9ba0904193 100644 --- a/pkgs/racket-test/tests/pkg/tests-failure.rkt +++ b/pkgs/racket-test/tests/pkg/tests-failure.rkt @@ -14,7 +14,7 @@ (shelly-case "failure on remove" $ "raco pkg install test-pkgs/pkg-test1.zip" =exit> 0 - $ "raco pkg show -l -u -a -d" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source +Directory\npkg-test1 +[a-f0-9]+ .*pkg-test1\"\n" + $ "raco pkg show -l -u -a -d" =stdout> #rx"Package +Checksum +Source +Directory\npkg-test1 +[a-f0-9.]+ .*pkg-test1\"\n" $ "racket -e '(require pkg-test1)'" =exit> 0 $ "racket -e '(file-or-directory-permissions (collection-path \"pkg-test1\") #o500)'" $ "raco pkg remove --no-trash pkg-test1" =exit> 1 @@ -23,7 +23,7 @@ (shelly-case "re-install must go to \"+1\"" $ "raco pkg install test-pkgs/pkg-test1.zip" =exit> 0 - $ "raco pkg show -l -u -a -d" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source +Directory\npkg-test1 +[a-f0-9]+ .*pkg-test1[+]1\"\n" + $ "raco pkg show -l -u -a -d" =stdout> #rx"Package +Checksum +Source +Directory\npkg-test1 +[a-f0-9.]+ .*pkg-test1[+]1\"\n" $ "racket -e '(require pkg-test1)'" =exit> 0 $ "raco pkg remove pkg-test1" =exit> 0 $ "racket -e '(require pkg-test1)'" =exit> 1) @@ -32,6 +32,6 @@ "re-install can go back to original place" $ "racket -l racket/base -l setup/dirs -e '(file-or-directory-permissions (build-path (find-user-pkgs-dir) \"pkg-test1/pkg-test1\") #o700)'" $ "raco pkg install test-pkgs/pkg-test1.zip" =exit> 0 - $ "raco pkg show -l -u -a -d" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source +Directory\npkg-test1 +[a-f0-9]+ .*pkg-test1\"\n" + $ "raco pkg show -l -u -a -d" =stdout> #rx"Package +Checksum +Source +Directory\npkg-test1 +[a-f0-9.]+ .*pkg-test1\"\n" $ "racket -e '(require pkg-test1)'" =exit> 0 $ "raco pkg remove pkg-test1" =exit> 0)))) diff --git a/pkgs/racket-test/tests/pkg/tests-migrate.rkt b/pkgs/racket-test/tests/pkg/tests-migrate.rkt index 1d4056a139..43b92cc909 100644 --- a/pkgs/racket-test/tests/pkg/tests-migrate.rkt +++ b/pkgs/racket-test/tests/pkg/tests-migrate.rkt @@ -22,7 +22,7 @@ 'source "http://localhost:9997/pkg-a-first.plt")) $ "raco pkg install -u --deps search-auto pkg-b" =exit> 0 - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-a\\* +[a-f0-9]+ \\(catalog \"pkg-a\"\\)\npkg-b +[a-f0-9]+ +\\(catalog \"pkg-b\"\\)\n" + $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-a\\* +[a-f0-9.]+ \\(catalog \"pkg-a\"\\)\npkg-b +[a-f0-9.]+ +\\(catalog \"pkg-b\"\\)\n" $ (~a "racket" " -e \"(require racket/file setup/dirs)\"" " -e \"(copy-directory/files (build-path (find-system-path 'addon-dir) (get-installation-name))" @@ -30,4 +30,4 @@ $ "raco pkg remove -u --auto pkg-b" $ "raco pkg show -l -u -a" =stdout> " [none]\n" $ "raco pkg migrate -u other" - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-a\\* +[a-f0-9]+ \\(catalog \"pkg-a\"\\)\npkg-b +[a-f0-9]+ +\\(catalog \"pkg-b\"\\)\n"))) + $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-a\\* +[a-f0-9.]+ \\(catalog \"pkg-a\"\\)\npkg-b +[a-f0-9.]+ +\\(catalog \"pkg-b\"\\)\n"))) diff --git a/pkgs/racket-test/tests/pkg/tests-promote.rkt b/pkgs/racket-test/tests/pkg/tests-promote.rkt index ec652c2ed9..ba4c96763f 100644 --- a/pkgs/racket-test/tests/pkg/tests-promote.rkt +++ b/pkgs/racket-test/tests/pkg/tests-promote.rkt @@ -15,26 +15,26 @@ "promote" $ "raco pkg config --set catalogs http://localhost:9990" $ "raco pkg install --deps search-auto test-pkgs/pkg-test2.zip" =exit> 0 - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1\\* +[a-f0-9]+ +\\(catalog \"pkg-test1\"\\)\npkg-test2 +[a-f0-9]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" + $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1\\* +[a-f0-9.]+ +\\(catalog \"pkg-test1\"\\)\npkg-test2 +[a-f0-9.]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" $ "raco pkg install test-pkgs/pkg-test2.zip" =exit> 1 =stderr> #rx"already installed" $ "raco pkg install test-pkgs/pkg-test1.zip" =exit> 1 =stderr> #rx"already installed from a different source" $ "raco pkg install pkg-test1" ; promote - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1 +[a-f0-9]+ +\\(catalog \"pkg-test1\"\\)\npkg-test2 +[a-f0-9]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" + $ "raco pkg show -l -u -a" =stdout> #rx"Package +Checksum +Source\npkg-test1 +[a-f0-9.]+ +\\(catalog \"pkg-test1\"\\)\npkg-test2 +[a-f0-9.]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" $ "raco pkg install pkg-test1" =exit> 1 =stderr> #rx"already installed" ; redundant promote fails $ "racket -e '(require pkg-test1)'" =exit> 0 $ "racket -e '(require pkg-test2)'" =exit> 0 $ "raco pkg remove --auto pkg-test1" =exit> 1 =stderr> #rx"cannot remove packages that are dependencies of other packages" $ "raco pkg remove --auto pkg-test2" - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1 +[a-f0-9]+ +\\(catalog \"pkg-test1\"\\)" + $ "raco pkg show -l -u -a" =stdout> #rx"Package +Checksum +Source\npkg-test1 +[a-f0-9.]+ +\\(catalog \"pkg-test1\"\\)" $ "raco pkg remove --auto pkg-test1" $ "raco pkg show -l -u -a" =stdout> " [none]\n") (shelly-case "demote" $ "raco pkg config --set catalogs http://localhost:9990" $ "raco pkg install --deps search-auto test-pkgs/pkg-test2.zip" =exit> 0 - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1\\* +[a-f0-9]+ +\\(catalog \"pkg-test1\"\\)\npkg-test2 +[a-f0-9]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" + $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1\\* +[a-f0-9.]+ +\\(catalog \"pkg-test1\"\\)\npkg-test2 +[a-f0-9.]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" $ "raco pkg remove --demote pkg-test2" - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1\\* +[a-f0-9]+ +\\(catalog \"pkg-test1\"\\)\npkg-test2\\* +[a-f0-9]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" + $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1\\* +[a-f0-9.]+ +\\(catalog \"pkg-test1\"\\)\npkg-test2\\* +[a-f0-9.]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" $ "racket -e '(require pkg-test1)'" =exit> 0 $ "racket -e '(require pkg-test2)'" =exit> 0 $ "raco pkg remove --auto" @@ -44,8 +44,8 @@ "demote+auto" $ "raco pkg config --set catalogs http://localhost:9990" $ "raco pkg install --deps search-auto test-pkgs/pkg-test2.zip" =exit> 0 - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1\\* +[a-f0-9]+ +\\(catalog \"pkg-test1\"\\)\npkg-test2 +[a-f0-9]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" + $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1\\* +[a-f0-9.]+ +\\(catalog \"pkg-test1\"\\)\npkg-test2 +[a-f0-9.]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" $ "raco pkg remove --demote --auto pkg-test1" =exit> 0 ; should have no effect - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1\\* +[a-f0-9]+ +\\(catalog \"pkg-test1\"\\)\npkg-test2 +[a-f0-9]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" + $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1\\* +[a-f0-9.]+ +\\(catalog \"pkg-test1\"\\)\npkg-test2 +[a-f0-9.]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" $ "raco pkg remove --demote --auto pkg-test2" $ "raco pkg show -l -u -a" =stdout> " [none]\n")))) diff --git a/pkgs/racket-test/tests/pkg/tests-remove.rkt b/pkgs/racket-test/tests/pkg/tests-remove.rkt index b3072cac71..073042a613 100644 --- a/pkgs/racket-test/tests/pkg/tests-remove.rkt +++ b/pkgs/racket-test/tests/pkg/tests-remove.rkt @@ -35,12 +35,12 @@ "pkg-test1 pkg-test1") (shelly-install "remove of dep fails" "test-pkgs/pkg-test1.zip" - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1 +[a-f0-9]+ +\\(file .+tests/pkg/test-pkgs/pkg-test1.zip\"\\)\n" + $ "raco pkg show -l -u -a" =stdout> #rx"Package +Checksum +Source\npkg-test1 +[a-f0-9.]+ +\\(file .+tests/pkg/test-pkgs/pkg-test1.zip\"\\)\n" $ "raco pkg install test-pkgs/pkg-test2.zip" - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1 +[a-f0-9]+ +\\(file .+tests/pkg/test-pkgs/pkg-test1.zip\"\\)\npkg-test2 +[a-f0-9]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" + $ "raco pkg show -l -u -a" =stdout> #rx"Package +Checksum +Source\npkg-test1 +[a-f0-9.]+ +\\(file .+tests/pkg/test-pkgs/pkg-test1.zip\"\\)\npkg-test2 +[a-f0-9.]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" $ "raco pkg remove pkg-test1" =exit> 1 =stderr> #rx"pkg-test1 \\(required by: \\(pkg-test2\\)\\)" $ "raco pkg remove pkg-test2" - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1 +[a-f0-9]+ +\\(file .+tests/pkg/test-pkgs/pkg-test1.zip\"\\)\n") + $ "raco pkg show -l -u -a" =stdout> #rx"Package +Checksum +Source\npkg-test1 +[a-f0-9.]+ +\\(file .+tests/pkg/test-pkgs/pkg-test1.zip\"\\)\n") (shelly-install "remove of dep can be forced" "test-pkgs/pkg-test1.zip" $ "raco pkg install test-pkgs/pkg-test2.zip" @@ -68,12 +68,12 @@ $ "racket -e '(require pkg-test1)'" =exit> 1 $ "racket -e '(require pkg-test2)'" =exit> 1 $ "raco pkg install --deps search-auto test-pkgs/pkg-test2.zip" =exit> 0 - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1\\* +[a-f0-9]+ +\\(catalog \"pkg-test1\"\\)\npkg-test2 +[a-f0-9]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" + $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1\\* +[a-f0-9.]+ +\\(catalog \"pkg-test1\"\\)\npkg-test2 +[a-f0-9.]+ +\\(file .+tests/pkg/test-pkgs/pkg-test2.zip\"\\)\n" $ "racket -e '(require pkg-test1)'" =exit> 0 $ "racket -e '(require pkg-test2)'" =exit> 0 $ "racket -e '(require pkg-test2/contains-dep)'" =exit> 0 $ "raco pkg remove pkg-test2" - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1\\* +[a-f0-9]+ +\\(catalog \"pkg-test1\"\\)\n" + $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-test1\\* +[a-f0-9.]+ +\\(catalog \"pkg-test1\"\\)\n" $ "racket -e '(require pkg-test1)'" =exit> 0 $ "raco pkg remove --auto" $ "raco pkg show -l -u -a" =stdout> " [none]\n" diff --git a/pkgs/racket-test/tests/pkg/tests-update-auto.rkt b/pkgs/racket-test/tests/pkg/tests-update-auto.rkt index b6833dd511..f20a8ef53c 100644 --- a/pkgs/racket-test/tests/pkg/tests-update-auto.rkt +++ b/pkgs/racket-test/tests/pkg/tests-update-auto.rkt @@ -48,12 +48,12 @@ 'source "http://localhost:9997/pkg-a-first.plt")) $ "raco pkg install --deps search-auto pkg-b" =exit> 0 #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-a\\* +[a-f0-9]+ \\(catalog \"pkg-a\"\\)\npkg-b +[a-f0-9]+ +\\(catalog \"pkg-b\"\\)\n" + $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-a\\* +[a-f0-9.]+ \\(catalog \"pkg-a\"\\)\npkg-b +[a-f0-9.]+ +\\(catalog \"pkg-b\"\\)\n" $ "racket -e '(require pkg-b)'" =exit> 43 $ "racket -e '(require pkg-a)'" =exit> 0 ;; remove auto doesn't do anything because everything is needed $ "raco pkg remove -u --auto" - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-a\\* +[a-f0-9]+ \\(catalog \"pkg-a\"\\)\npkg-b +[a-f0-9]+ +\\(catalog \"pkg-b\"\\)\n" + $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-a\\* +[a-f0-9.]+ \\(catalog \"pkg-a\"\\)\npkg-b +[a-f0-9.]+ +\\(catalog \"pkg-b\"\\)\n" $ "racket -e '(require pkg-b)'" =exit> 43 $ "racket -e '(require pkg-a)'" =exit> 0 ;; pkg-a is now an auto @@ -65,7 +65,7 @@ $ "raco pkg update -a" =exit> 0 $ "racket -e '(require pkg-a)'" =exit> 43 $ "raco pkg remove pkg-b" - $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-a\\* +[a-f0-9]+ +\\(catalog \"pkg-a\"\\)\n" + $ "raco pkg show -l -u -a" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-a\\* +[a-f0-9.]+ +\\(catalog \"pkg-a\"\\)\n" $ "racket -e '(require pkg-b)'" =exit> 1 ;; pkg-a is now not needed $ "raco pkg remove --auto"