Add a series of reftests showing empty conflict messages

ocaml · Aug 19, 2022 · d87d88a · d87d88a
1 parent 7c51e21
commit d87d88a
Show file tree

Hide file tree

Showing 8 changed files with 393 additions and 0 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -313,6 +313,7 @@ users)
   * Add test for switch upgrade from 2.0 root, with pinned compiler [#5176 @rjbou @kit-ty-kate]
   * Add switch import (for pinned packages) test [#5181 @rjbou]
   * Add `--with-tools` test [#5160 @rjbou]
+  * Add a series of reftests showing empty conflict messages [#5253 @kit-ty-kate]
 ### Engine
   * Add `opam-cat` to normalise opam file printing [#4763 @rjbou @dra27] [2.1.0~rc2 #4715]
   * Fix meld reftest: open only with failing ones [#4913 @rjbou]

diff --git a/tests/reftests/dune.inc b/tests/reftests/dune.inc
@@ -254,6 +254,108 @@
    %{targets}
    (run ./run.exe %{bin:opam} %{dep:dot-install.test} %{read-lines:testing-env}))))
 
+(rule
+ (alias reftest-empty-conflicts-001)
+ (action
+  (diff empty-conflicts-001.test empty-conflicts-001.out)))
+
+(alias
+ (name reftest)
+ (deps (alias reftest-empty-conflicts-001)))
+
+(rule
+ (targets empty-conflicts-001.out)
+ (deps root-297366c)
+ (action
+  (with-stdout-to
+   %{targets}
+   (run ./run.exe %{bin:opam} %{dep:empty-conflicts-001.test} %{read-lines:testing-env}))))
+
+(rule
+ (alias reftest-empty-conflicts-002)
+ (action
+  (diff empty-conflicts-002.test empty-conflicts-002.out)))
+
+(alias
+ (name reftest)
+ (deps (alias reftest-empty-conflicts-002)))
+
+(rule
+ (targets empty-conflicts-002.out)
+ (deps root-11ea1cb)
+ (action
+  (with-stdout-to
+   %{targets}
+   (run ./run.exe %{bin:opam} %{dep:empty-conflicts-002.test} %{read-lines:testing-env}))))
+
+(rule
+ (alias reftest-empty-conflicts-003)
+ (action
+  (diff empty-conflicts-003.test empty-conflicts-003.out)))
+
+(alias
+ (name reftest)
+ (deps (alias reftest-empty-conflicts-003)))
+
+(rule
+ (targets empty-conflicts-003.out)
+ (deps root-3235916)
+ (action
+  (with-stdout-to
+   %{targets}
+   (run ./run.exe %{bin:opam} %{dep:empty-conflicts-003.test} %{read-lines:testing-env}))))
+
+(rule
+ (alias reftest-empty-conflicts-004)
+ (action
+  (diff empty-conflicts-004.test empty-conflicts-004.out)))
+
+(alias
+ (name reftest)
+ (deps (alias reftest-empty-conflicts-004)))
+
+(rule
+ (targets empty-conflicts-004.out)
+ (deps root-0070613707)
+ (action
+  (with-stdout-to
+   %{targets}
+   (run ./run.exe %{bin:opam} %{dep:empty-conflicts-004.test} %{read-lines:testing-env}))))
+
+(rule
+ (alias reftest-empty-conflicts-005)
+ (action
+  (diff empty-conflicts-005.test empty-conflicts-005.out)))
+
+(alias
+ (name reftest)
+ (deps (alias reftest-empty-conflicts-005)))
+
+(rule
+ (targets empty-conflicts-005.out)
+ (deps root-de897adf36c4230dfea812f40c98223b31c4521a)
+ (action
+  (with-stdout-to
+   %{targets}
+   (run ./run.exe %{bin:opam} %{dep:empty-conflicts-005.test} %{read-lines:testing-env}))))
+
+(rule
+ (alias reftest-empty-conflicts-006)
+ (action
+  (diff empty-conflicts-006.test empty-conflicts-006.out)))
+
+(alias
+ (name reftest)
+ (deps (alias reftest-empty-conflicts-006)))
+
+(rule
+ (targets empty-conflicts-006.out)
+ (deps root-c1842d168d)
+ (action
+  (with-stdout-to
+   %{targets}
+   (run ./run.exe %{bin:opam} %{dep:empty-conflicts-006.test} %{read-lines:testing-env}))))
+
 (rule
  (alias reftest-env)
  (action
@@ -960,6 +1062,26 @@
            --no-setup --bypass-checks --no-opamrc --bare
            file://%{dep:opam-repo-N0REP0})))))
 
+(rule
+ (targets opam-archive-0070613707.tar.gz)
+ (action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/0070613707.tar.gz)))
+
+(rule
+  (targets opam-repo-0070613707)
+  (action
+   (progn
+    (run mkdir -p %{targets})
+    (run tar -C %{targets} -xzf %{dep:opam-archive-0070613707.tar.gz} --strip-components=1))))
+
+(rule
+  (targets root-0070613707)
+  (action
+   (progn
+    (ignore-stdout
+    (run %{bin:opam} init --root=%{targets}
+           --no-setup --bypass-checks --no-opamrc --bare
+           file://%{dep:opam-repo-0070613707})))))
+
 (rule
  (targets opam-archive-009e00fa.tar.gz)
  (action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/009e00fa.tar.gz)))
@@ -980,6 +1102,66 @@
            --no-setup --bypass-checks --no-opamrc --bare
            file://%{dep:opam-repo-009e00fa})))))
 
+(rule
+ (targets opam-archive-11ea1cb.tar.gz)
+ (action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/11ea1cb.tar.gz)))
+
+(rule
+  (targets opam-repo-11ea1cb)
+  (action
+   (progn
+    (run mkdir -p %{targets})
+    (run tar -C %{targets} -xzf %{dep:opam-archive-11ea1cb.tar.gz} --strip-components=1))))
+
+(rule
+  (targets root-11ea1cb)
+  (action
+   (progn
+    (ignore-stdout
+    (run %{bin:opam} init --root=%{targets}
+           --no-setup --bypass-checks --no-opamrc --bare
+           file://%{dep:opam-repo-11ea1cb})))))
+
+(rule
+ (targets opam-archive-297366c.tar.gz)
+ (action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/297366c.tar.gz)))
+
+(rule
+  (targets opam-repo-297366c)
+  (action
+   (progn
+    (run mkdir -p %{targets})
+    (run tar -C %{targets} -xzf %{dep:opam-archive-297366c.tar.gz} --strip-components=1))))
+
+(rule
+  (targets root-297366c)
+  (action
+   (progn
+    (ignore-stdout
+    (run %{bin:opam} init --root=%{targets}
+           --no-setup --bypass-checks --no-opamrc --bare
+           file://%{dep:opam-repo-297366c})))))
+
+(rule
+ (targets opam-archive-3235916.tar.gz)
+ (action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/3235916.tar.gz)))
+
+(rule
+  (targets opam-repo-3235916)
+  (action
+   (progn
+    (run mkdir -p %{targets})
+    (run tar -C %{targets} -xzf %{dep:opam-archive-3235916.tar.gz} --strip-components=1))))
+
+(rule
+  (targets root-3235916)
+  (action
+   (progn
+    (ignore-stdout
+    (run %{bin:opam} init --root=%{targets}
+           --no-setup --bypass-checks --no-opamrc --bare
+           file://%{dep:opam-repo-3235916})))))
+
 (rule
  (targets opam-archive-7090735c.tar.gz)
  (action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/7090735c.tar.gz)))
@@ -1060,6 +1242,26 @@
            --no-setup --bypass-checks --no-opamrc --bare
            file://%{dep:opam-repo-ad4dd344})))))
 
+(rule
+ (targets opam-archive-c1842d168d.tar.gz)
+ (action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/c1842d168d.tar.gz)))
+
+(rule
+  (targets opam-repo-c1842d168d)
+  (action
+   (progn
+    (run mkdir -p %{targets})
+    (run tar -C %{targets} -xzf %{dep:opam-archive-c1842d168d.tar.gz} --strip-components=1))))
+
+(rule
+  (targets root-c1842d168d)
+  (action
+   (progn
+    (ignore-stdout
+    (run %{bin:opam} init --root=%{targets}
+           --no-setup --bypass-checks --no-opamrc --bare
+           file://%{dep:opam-repo-c1842d168d})))))
+
 (rule
  (targets opam-archive-c1d23f0e.tar.gz)
  (action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/c1d23f0e.tar.gz)))
@@ -1080,6 +1282,26 @@
            --no-setup --bypass-checks --no-opamrc --bare
            file://%{dep:opam-repo-c1d23f0e})))))
 
+(rule
+ (targets opam-archive-de897adf36c4230dfea812f40c98223b31c4521a.tar.gz)
+ (action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/de897adf36c4230dfea812f40c98223b31c4521a.tar.gz)))
+
+(rule
+  (targets opam-repo-de897adf36c4230dfea812f40c98223b31c4521a)
+  (action
+   (progn
+    (run mkdir -p %{targets})
+    (run tar -C %{targets} -xzf %{dep:opam-archive-de897adf36c4230dfea812f40c98223b31c4521a.tar.gz} --strip-components=1))))
+
+(rule
+  (targets root-de897adf36c4230dfea812f40c98223b31c4521a)
+  (action
+   (progn
+    (ignore-stdout
+    (run %{bin:opam} init --root=%{targets}
+           --no-setup --bypass-checks --no-opamrc --bare
+           file://%{dep:opam-repo-de897adf36c4230dfea812f40c98223b31c4521a})))))
+
 (rule
  (targets opam-archive-f372039d.tar.gz)
  (action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/f372039d.tar.gz)))

diff --git a/tests/reftests/empty-conflicts-001.test b/tests/reftests/empty-conflicts-001.test
@@ -0,0 +1,20 @@
+297366c
+### OPAMYES=1 OPAMSTRICT=0
+### OPAMVAR_os=linux opam switch create test ocaml-base-compiler.4.07.1 --fake
+
+<><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>
+Switch invariant: ["ocaml-base-compiler" {= "4.07.1"}]
+
+<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+Faking installation of base-bigarray.base
+Faking installation of base-threads.base
+Faking installation of base-unix.base
+Faking installation of ocaml-base-compiler.4.07.1
+Faking installation of ocaml-config.1
+Faking installation of ocaml.4.07.1
+Done.
+### OPAMVAR_arch=x86_64 OPAMVAR_os=linux OPAMVAR_os_family=arch OPAMVAR_os_distribution=archarm opam install --show h2-mirage.0.9.0
+[ERROR] Package conflict!
+[ERROR] Internal error while computing conflict explanations:
+        sorry about that. Please report how you got here in https://github.com/ocaml/opam/discussions/5130 if possible.
+# Return code 99 #
diff --git a/tests/reftests/empty-conflicts-002.test b/tests/reftests/empty-conflicts-002.test
@@ -0,0 +1,55 @@
+11ea1cb
+### OPAMYES=1 OPAMSTRICT=0
+### OPAMVAR_os=linux opam switch create test ocaml-base-compiler.4.14.0 --fake
+
+<><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>
+Switch invariant: ["ocaml-base-compiler" {= "4.14.0"}]
+
+<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+Faking installation of base-bigarray.base
+Faking installation of base-threads.base
+Faking installation of base-unix.base
+Faking installation of ocaml-base-compiler.4.14.0
+Faking installation of ocaml-config.2
+Faking installation of ocaml.4.14.0
+Faking installation of ocaml-options-vanilla.1
+Done.
+### opam pin add -k version -n ppx_deriving_yojson.3.7.0 3.7.0
+ppx_deriving_yojson is now pinned to version 3.7.0
+### opam install ppx_deriving_yojson.3.7.0 --fake
+The following actions will be faked:
+=== install 13 packages
+  - install cppo                1.6.9          [required by ppx_deriving, yojson]
+  - install dune                3.4.1          [required by ppx_deriving_yojson]
+  - install ocaml-compiler-libs v0.12.4        [required by ppxlib]
+  - install ocamlfind           1.9.5          [required by ppx_deriving]
+  - install ppx_derivers        1.2.1          [required by ppx_deriving]
+  - install ppx_deriving        5.2.1          [required by ppx_deriving_yojson]
+  - install ppx_deriving_yojson 3.7.0 (pinned)
+  - install ppxlib              0.27.0         [required by ppx_deriving_yojson]
+  - install result              1.5            [required by ppx_deriving_yojson]
+  - install seq                 base           [required by yojson]
+  - install sexplib0            v0.15.1        [required by ppxlib]
+  - install stdlib-shims        0.3.0          [required by ppxlib]
+  - install yojson              2.0.2          [required by ppx_deriving_yojson]
+
+<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+Faking installation of dune.3.4.1
+Faking installation of cppo.1.6.9
+Faking installation of ocaml-compiler-libs.v0.12.4
+Faking installation of ocamlfind.1.9.5
+Faking installation of ppx_derivers.1.2.1
+Faking installation of result.1.5
+Faking installation of seq.base
+Faking installation of sexplib0.v0.15.1
+Faking installation of stdlib-shims.0.3.0
+Faking installation of ppxlib.0.27.0
+Faking installation of ppx_deriving.5.2.1
+Faking installation of yojson.2.0.2
+Faking installation of ppx_deriving_yojson.3.7.0
+Done.
+### OPAMVAR_arch=x86_64 opam install --show fstar.2022.01.15
+[ERROR] Package conflict!
+[ERROR] Internal error while computing conflict explanations:
+        sorry about that. Please report how you got here in https://github.com/ocaml/opam/discussions/5130 if possible.
+# Return code 99 #
diff --git a/tests/reftests/empty-conflicts-003.test b/tests/reftests/empty-conflicts-003.test
@@ -0,0 +1,21 @@
+3235916
+### OPAMYES=1 OPAMSTRICT=0
+### OPAMVAR_os=linux opam switch create test ocaml-base-compiler.4.14.0 --fake
+
+<><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>
+Switch invariant: ["ocaml-base-compiler" {= "4.14.0"}]
+
+<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+Faking installation of base-bigarray.base
+Faking installation of base-threads.base
+Faking installation of base-unix.base
+Faking installation of ocaml-base-compiler.4.14.0
+Faking installation of ocaml-config.2
+Faking installation of ocaml.4.14.0
+Faking installation of ocaml-options-vanilla.1
+Done.
+### OPAMVAR_os=linux opam install --show disml
+[ERROR] Package conflict!
+[ERROR] Internal error while computing conflict explanations:
+        sorry about that. Please report how you got here in https://github.com/ocaml/opam/discussions/5130 if possible.
+# Return code 99 #
diff --git a/tests/reftests/empty-conflicts-004.test b/tests/reftests/empty-conflicts-004.test
@@ -0,0 +1,20 @@
+0070613707
+### OPAMYES=1 OPAMSTRICT=0
+### opam switch create test ocaml-variants.4.14.0+trunk --fake
+
+<><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>
+Switch invariant: ["ocaml-variants" {= "4.14.0+trunk"}]
+
+<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+Faking installation of base-bigarray.base
+Faking installation of base-threads.base
+Faking installation of base-unix.base
+Faking installation of ocaml-variants.4.14.0+trunk
+Faking installation of ocaml-config.2
+Faking installation of ocaml.4.14.0
+Done.
+### opam install --show camlp5 GT ppxlib.0.25.0
+[ERROR] Package conflict!
+[ERROR] Internal error while computing conflict explanations:
+        sorry about that. Please report how you got here in https://github.com/ocaml/opam/discussions/5130 if possible.
+# Return code 99 #