reftest: set opam-version variable to 2.2 for stability of conflict t…

…ests based on opam repo
ocaml · Jun 27, 2024 · 97efa7a · 97efa7a
1 parent c66b65d
commit 97efa7a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 0 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -102,6 +102,7 @@ users)
 ## Reftests
 ### Tests
   * cli versioning: untie output from current major version [#6045 @rjbou]
+  * Set `opam-version` to 2.2 for some conflict message tests based on opam repository to stabilise their output [#6045 @rjbou]
 
 ### Engine
 

diff --git a/tests/reftests/empty-conflicts-001.test b/tests/reftests/empty-conflicts-001.test
@@ -1,6 +1,8 @@
 297366c
 ### OPAMYES=1 OPAMSTRICT=0
 ### OPAMVAR_arch=x86_64 OPAMVAR_os=linux OPAMVAR_os_family=arch OPAMVAR_os_distribution=archarm
+### # We need to set this version to keep the test as is
+### OPAMVAR_opam_version=2.2.0
 ### opam switch create test ocaml-base-compiler.4.07.1 --fake
 
 <><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>

diff --git a/tests/reftests/empty-conflicts-002.test b/tests/reftests/empty-conflicts-002.test
@@ -1,6 +1,8 @@
 11ea1cb
 ### OPAMYES=1 OPAMSTRICT=0
 ### OPAMVAR_arch=x86_64 OPAMVAR_os=linux OPAMVAR_os_family=arch OPAMVAR_os_distribution=archarm
+### # We need to set this version to keep the test as is
+### OPAMVAR_opam_version=2.2.0
 ### opam switch create test ocaml-base-compiler.4.14.0 --fake
 
 <><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>

diff --git a/tests/reftests/empty-conflicts-003.test b/tests/reftests/empty-conflicts-003.test
@@ -1,6 +1,8 @@
 3235916
 ### OPAMYES=1 OPAMSTRICT=0
 ### OPAMVAR_arch=arm64 OPAMVAR_os=linux OPAMVAR_os_family=arch OPAMVAR_os_distribution=archarm
+### # We need to set this version to keep the test as is
+### OPAMVAR_opam_version=2.2.0
 ### opam switch create test ocaml-base-compiler.4.14.0 --fake
 
 <><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>

diff --git a/tests/reftests/list-coinstallable.test b/tests/reftests/list-coinstallable.test
@@ -1,6 +1,8 @@
 7371c1d9
 ### : Test for #5399 (opam list --recursive --coinstallable-with <pkg>.<version> returning all versions of <pkg>)
 ### OPAMVAR_arch=arm64 OPAMVAR_os=linux OPAMVAR_os_family=arch OPAMVAR_os_distribution=archarm
+### # We need to set this version to keep the test as is
+### OPAMVAR_opam_version=2.2.0
 ### opam switch create 4.12.0 --fake
 
 <><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>

diff --git a/tests/reftests/unhelpful-conflicts-001.test b/tests/reftests/unhelpful-conflicts-001.test
@@ -1,6 +1,8 @@
 c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a
 ### OPAMYES=1 OPAMSTRICT=0
 ### OPAMVAR_arch=arm64 OPAMVAR_os=macos OPAMVAR_os_family=homebrew OPAMVAR_os_distribution=homebrew
+### # We need to set this version to keep the test as is
+### OPAMVAR_opam_version=2.2.0
 ### opam switch create test ocaml-base-compiler.5.0.0~alpha0 --fake
 
 <><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>