Update outputs for opam-related changes

na4zagin3 · Apr 23, 2022 · 1d4f421 · 1d4f421
1 parent 3133df4
commit 1d4f421
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 14 deletions.
diff --git a/test/testcases/command_build__doc_with_autogen.expected b/test/testcases/command_build__doc_with_autogen.expected
@@ -112,7 +112,7 @@ diff -Nr @@empty_dir@@/doc-grcnum.saty @@temp_dir@@/pkg/doc-grcnum.saty
 0a1
 > @@doc-grcnum.saty@@
 diff -Nr @@empty_dir@@/lockdown.yaml @@temp_dir@@/pkg/lockdown.yaml
-0a1,15
+0a1,20
 > satyrographos: 0.0.3
 > dependencies:
 > - Opam
@@ -123,6 +123,11 @@ diff -Nr @@empty_dir@@/lockdown.yaml @@temp_dir@@/pkg/lockdown.yaml
 >     version: 0.0.2.7
 >   - name: satysfi
 >     version: 0.0.5+dev2020.09.05
+>   repos:
+>   - name: default
+>     url: https://opam.ocaml.org/
+>   - name: satysfi-external
+>     url: git+https://github.com/gfngfn/satysfi-external-repo.git
 > autogen:
 >   '$today':
 >     datetime: 2020-11-06T00:46:35.000000+09:00

diff --git a/test/testcases/command_build__doc_with_libraries.expected b/test/testcases/command_build__doc_with_libraries.expected
@@ -36,7 +36,7 @@ Installation completed!
 Command invoked:
 opam pin add --no-action --yes satysfi-grcnum file://@@temp_dir@@/pkg
 Command invoked:
-opam reinstall --verbose --yes @@temp_dir@@/pkg
+opam reinstall --verbose --yes -- @@temp_dir@@/pkg
 Command invoked:
 opam install --yes satysfi-fonts-theano satysfi-grcnum
 Command invoked:

diff --git a/test/testcases/command_lockdown_restore__opam.expected b/test/testcases/command_lockdown_restore__opam.expected
@@ -69,7 +69,7 @@ diff -Nr @@empty_dir@@/grcnum.satyh @@temp_dir@@/pkg/grcnum.satyh
 0a1
 > @@grcnum.satyh@@
 diff -Nr @@empty_dir@@/lockdown.yaml @@temp_dir@@/pkg/lockdown.yaml
-0a1,11
+0a1,16
 > satyrographos: 0.0.3
 > dependencies:
 > - Opam
@@ -80,6 +80,11 @@ diff -Nr @@empty_dir@@/lockdown.yaml @@temp_dir@@/pkg/lockdown.yaml
 >     version: 0.0.2.7
 >   - name: satysfi
 >     version: 0.0.5+dev2020.09.05
+>   repos:
+>   - name: satysfi-external
+>     url: git+https://github.com/gfngfn/satysfi-external-repo.git
+>   - name: default
+>     url: https://opam.ocaml.org/
 > autogen: {}
 diff -Nr @@empty_dir@@/satysfi-grcnum.opam @@temp_dir@@/pkg/satysfi-grcnum.opam
 0a1,30
@@ -115,7 +120,7 @@ diff -Nr @@empty_dir@@/satysfi-grcnum.opam @@temp_dir@@/pkg/satysfi-grcnum.opam
 > 
 ------------------------------------------------------------
 Command invoked:
-opam list -i --color=never --columns name,installed-version --separator=, --recursive --required-by satysfi-fonts-theano,satysfi-grcnum
+opam list -i --color=never --columns name,repository,installed-version --separator=, --recursive --required-by satysfi-fonts-theano,satysfi-grcnum
 Installing packages
 ------------------------------------------------------------
 ------------------------------------------------------------

diff --git a/test/testcases/command_lockdown_save__invalid_opam_response.expected b/test/testcases/command_lockdown_save__invalid_opam_response.expected
@@ -69,7 +69,7 @@ diff -Nr @@empty_dir@@/grcnum.satyh @@temp_dir@@/pkg/grcnum.satyh
 0a1
 > @@grcnum.satyh@@
 diff -Nr @@empty_dir@@/lockdown.yaml @@temp_dir@@/pkg/lockdown.yaml
-0a1,11
+0a1,16
 > satyrographos: 0.0.3
 > dependencies:
 > - Opam
@@ -80,6 +80,11 @@ diff -Nr @@empty_dir@@/lockdown.yaml @@temp_dir@@/pkg/lockdown.yaml
 >     version: 0.0.2.7
 >   - name: satysfi
 >     version: 0.0.5+dev2020.09.05
+>   repos:
+>   - name: satysfi-external
+>     url: git+https://github.com/gfngfn/satysfi-external-repo.git
+>   - name: default
+>     url: https://opam.ocaml.org/
 > autogen: {}
 diff -Nr @@empty_dir@@/satysfi-grcnum.opam @@temp_dir@@/pkg/satysfi-grcnum.opam
 0a1,30
@@ -115,13 +120,13 @@ diff -Nr @@empty_dir@@/satysfi-grcnum.opam @@temp_dir@@/pkg/satysfi-grcnum.opam
 > 
 ------------------------------------------------------------
 Command invoked:
-opam list -i --color=never --columns name,installed-version --separator=, --recursive --required-by satysfi-fonts-theano,satysfi-grcnum
-Installing packages
-------------------------------------------------------------
-Gathering OPAM package information...
-Exception:
+opam list -i --color=never --columns name,repository,installed-version --separator=, --recursive --required-by satysfi-fonts-theano,satysfi-grcnum
+Installing packages                       +
+------------------------------------------+------------------
+Gathering OPAM package information...     +
+Exception:                                +
 (Failure
-  "BUG: Unrecognizable package information from OPAM: \"***invalid,response,!!!\"")
+  "BUG: Unrecognizable package information from OPAM: \"***,invalid,response,!!!\"")
 ------------------------------------------------------------
 @@temp_dir@@/pkg
 @@temp_dir@@/pkg/Makefile
@@ -222,4 +227,4 @@ diff -Nr @@empty_dir@@/satysfi-grcnum.opam @@temp_dir@@/pkg/satysfi-grcnum.opam
 > 
 ------------------------------------------------------------
 Command invoked:
-opam list -i --color=never --columns name,installed-version --separator=, --recursive --required-by satysfi-fonts-theano,satysfi-grcnum
+opam list -i --color=never --columns name,repository,installed-version --separator=, --recursive --required-by satysfi-fonts-theano,satysfi-grcnum
diff --git a/test/testcases/command_lockdown_save__opam.expected b/test/testcases/command_lockdown_save__opam.expected
@@ -69,7 +69,7 @@ diff -Nr @@empty_dir@@/grcnum.satyh @@temp_dir@@/pkg/grcnum.satyh
 0a1
 > @@grcnum.satyh@@
 diff -Nr @@empty_dir@@/lockdown.yaml @@temp_dir@@/pkg/lockdown.yaml
-0a1,11
+0a1,16
 > satyrographos: 0.0.3
 > dependencies:
 > - Opam
@@ -80,6 +80,11 @@ diff -Nr @@empty_dir@@/lockdown.yaml @@temp_dir@@/pkg/lockdown.yaml
 >     version: 0.0.2.7
 >   - name: satysfi
 >     version: 0.0.5+dev2020.09.05
+>   repos:
+>   - name: satysfi-external
+>     url: git+https://github.com/gfngfn/satysfi-external-repo.git
+>   - name: default
+>     url: https://opam.ocaml.org/
 > autogen: {}
 diff -Nr @@empty_dir@@/satysfi-grcnum.opam @@temp_dir@@/pkg/satysfi-grcnum.opam
 0a1,30
@@ -115,4 +120,4 @@ diff -Nr @@empty_dir@@/satysfi-grcnum.opam @@temp_dir@@/pkg/satysfi-grcnum.opam
 > 
 ------------------------------------------------------------
 Command invoked:
-opam list -i --color=never --columns name,installed-version --separator=, --recursive --required-by satysfi-fonts-theano,satysfi-grcnum
+opam list -i --color=never --columns name,repository,installed-version --separator=, --recursive --required-by satysfi-fonts-theano,satysfi-grcnum