From 2e5fe88a29b384184223455150eb127a219b148f Mon Sep 17 00:00:00 2001
From: Raja Boujbel <raja.boujbel@ocamlpro.com>
Date: Thu, 12 Dec 2024 17:55:07 +0100
Subject: [PATCH] fixup! Extend the tests on opam admin check by including all
 the arguments

---
 tests/reftests/admin.test | 70 ++++++++++++++++++++++++++++++---------
 1 file changed, 54 insertions(+), 16 deletions(-)

diff --git a/tests/reftests/admin.test b/tests/reftests/admin.test
index 657d81601f8..819d5275bcd 100644
--- a/tests/reftests/admin.test
+++ b/tests/reftests/admin.test
@@ -321,56 +321,94 @@ vars                --          A word
 ### :::::::::::::
 ### :III: check :
 ### :::::::::::::
+### <packages/suspendisse/suspendisse.1/opam>
+opam-version: "2.0"
+depends: [
+  "lorem" { = "1.0" & with-test } # for obsolete -i test
+  "not-found" { with-test } # for installability -i test
+]
+### <packages/lectus/lectus.1/opam>
+opam-version: "2.0"
+depends: [
+  "tortor" # for cycle test
+  "dignissim" {with-doc} # for cycle -i test
+]
+### <packages/tortor/tortor.1/opam>
+opam-version: "2.0"
+depends: "lectus"
+### <packages/dignissim/dignissim.1/opam>
+opam-version: "2.0"
+depends: "lectus"
+### # by default, the check does installability & cycle check
 ### opam admin check
 Checking installability of every package. This may take a few minutes...
-[ERROR] These packages are not installable (2):
-        ocaml-system.1.2 risus.1
-Summary: out of 21 packages (18 distinct names)
-- 2 uninstallable roots
+[ERROR] These packages are not installable (3):
+        ocaml-system.1.2 risus.1 suspendisse.1
+[ERROR] Dependency cycles detected:
+  * lectus = 1 -> dignissim = 1
+  * lectus = 1 -> tortor = 1
+Summary: out of 25 packages (22 distinct names)
+- 3 uninstallable roots
+- 3 packages part of dependency cycles
 
 # Return code 1 #
 ### opam admin check -i
 Checking installability of every package. This may take a few minutes...
 [ERROR] These packages are not installable (2):
         ocaml-system.1.2 risus.1
-Summary: out of 21 packages (18 distinct names)
+[ERROR] Dependency cycles detected:
+  * lectus = 1 -> tortor = 1
+Summary: out of 25 packages (22 distinct names)
 - 2 uninstallable roots
+- 2 packages part of dependency cycles
 
 # Return code 1 #
 ### opam admin check --installability
 Checking installability of every package. This may take a few minutes...
-[ERROR] These packages are not installable (2):
-        ocaml-system.1.2 risus.1
-Summary: out of 21 packages (18 distinct names)
-- 2 uninstallable roots
+[ERROR] These packages are not installable (3):
+        ocaml-system.1.2 risus.1 suspendisse.1
+Summary: out of 25 packages (22 distinct names)
+- 3 uninstallable roots
 
 # Return code 1 #
 ### opam admin check --installability -i
 Checking installability of every package. This may take a few minutes...
 [ERROR] These packages are not installable (2):
         ocaml-system.1.2 risus.1
-Summary: out of 21 packages (18 distinct names)
+Summary: out of 25 packages (22 distinct names)
 - 2 uninstallable roots
 
 # Return code 1 #
 ### opam admin check --obsolete
 [ERROR] Obsolete packages detected:
-  - lorem 1.0, 2.0
-Summary: out of 21 packages (18 distinct names)
-- 2 obsolete packages
+  - lorem 2.0
+Summary: out of 25 packages (22 distinct names)
+- 1 obsolete packages
 
 # Return code 1 #
 ### opam admin check --obsolete -i
 [ERROR] Obsolete packages detected:
   - lorem 1.0, 2.0
-Summary: out of 21 packages (18 distinct names)
+Summary: out of 25 packages (22 distinct names)
 - 2 obsolete packages
 
 # Return code 1 #
 ### opam admin check --cycles
-No issues detected on this repository's 21 packages
+[ERROR] Dependency cycles detected:
+  * lectus = 1 -> dignissim = 1
+  * lectus = 1 -> tortor = 1
+Summary: out of 25 packages (22 distinct names)
+- 3 packages part of dependency cycles
+
+# Return code 1 #
 ### opam admin check --cycles -i
-No issues detected on this repository's 21 packages
+[ERROR] Dependency cycles detected:
+  * lectus = 1 -> tortor = 1
+Summary: out of 25 packages (22 distinct names)
+- 2 packages part of dependency cycles
+
+# Return code 1 #
+### rm -r packages/suspendisse packages/lectus packages/tortor packages/dignissim
 ### : index :
 ### opam admin index
 Generating urls.txt...