From f5581c5ba75b08bd138ae363c129d37a40c4d63b Mon Sep 17 00:00:00 2001
From: Raja Boujbel <raja.boujbel@ocamlpro.com>
Date: Thu, 3 Mar 2022 12:33:08 +0100
Subject: [PATCH] reftests: update lock with upgrade

---
 tests/reftests/lock.test | 46 ++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/tests/reftests/lock.test b/tests/reftests/lock.test
index e86f53717f6..2c1a95eafe6 100644
--- a/tests/reftests/lock.test
+++ b/tests/reftests/lock.test
@@ -195,12 +195,11 @@ version: "l2"
 Now run 'opam upgrade' to apply any package updates.
 ### opam upgrade --locked
 The following actions will be performed:
-  - recompile tolock l1 (pinned) [upstream or system changes]
+  - upgrade tolock l1 to l2 (pinned)
 
 <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
--> retrieved tolock.l1  (no changes)
 -> removed   tolock.l1
--> installed tolock.l1
+-> installed tolock.l2
 Done.
 ### <pin:tolock/tolock.opam>
 build: [ "false" ]
@@ -210,27 +209,19 @@ version: "l3"
 ### opam update tolock
 
 <><> Synchronising development packages <><><><><><><><><><><><><><><><><><><><>
-[tolock.l1] synchronised (file://${BASEDIR}/tolock)
+[tolock.l2] synchronised (file://${BASEDIR}/tolock)
 [tolock] Conflicting update of the metadata from file://${BASEDIR}/tolock.
 Override files in ${BASEDIR}/OPAM/locking/.opam-switch/overlay/tolock (there will be a backup)? [Y/n] y
 User metadata backed up in ${BASEDIR}/OPAM/backup/tolock.bak
 Now run 'opam upgrade' to apply any package updates.
 ### opam upgrade --locked
 The following actions will be performed:
-  - downgrade tolock l1 to 3 (pinned) [no longer available]
+  - upgrade tolock l2 to l3 (pinned)
 
 <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
-[ERROR] The compilation of tolock.3 failed at "false".
-
-
-
-
-<><> Error report <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
-+- The following actions failed
-| - build tolock 3
-+- 
-- No changes have been performed
-# Return code 31 #
+-> removed   tolock.l2
+-> installed tolock.l3
+Done.
 ### <pin:tolock/tolock.opam>
 build: [ "false" ]
 version: "4"
@@ -239,22 +230,17 @@ version: "l4"
 ### OPAMLOCKED=locked opam update tolock
 
 <><> Synchronising development packages <><><><><><><><><><><><><><><><><><><><>
-[tolock.3] synchronised (file://${BASEDIR}/tolock)
-[tolock] Installing new package description from upstream file://${BASEDIR}/tolock
+[tolock.l3] synchronised (file://${BASEDIR}/tolock)
+[tolock] Conflicting update of the metadata from file://${BASEDIR}/tolock.
+Override files in ${BASEDIR}/OPAM/locking/.opam-switch/overlay/tolock (there will be a backup)? [Y/n] y
+User metadata backed up in ${BASEDIR}/OPAM/backup/tolock.bak
 Now run 'opam upgrade' to apply any package updates.
 ### opam upgrade
 The following actions will be performed:
-  - downgrade tolock l1 to 4 (pinned) [no longer available]
+  - upgrade tolock l3 to l4 (pinned)
 
 <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
-[ERROR] The compilation of tolock.4 failed at "false".
-
-
-
-
-<><> Error report <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
-+- The following actions failed
-| - build tolock 4
-+- 
-- No changes have been performed
-# Return code 31 #
+-> retrieved tolock.l4  (file://${BASEDIR}/tolock)
+-> removed   tolock.l3
+-> installed tolock.l4
+Done.