From b6102badb2719cc0120b34741ed373cf8a28d23c Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 28 Mar 2018 21:42:23 +0300
Subject: Implement package drops via plan refinements

---
 tests/pkg-build.test | 13 ++++++++-----
 tests/pkg-drop.test  |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/pkg-build.test b/tests/pkg-build.test
index 8b114cd..18b4813 100644
--- a/tests/pkg-build.test
+++ b/tests/pkg-build.test
@@ -630,7 +630,7 @@ rep_fetch     += -d cfg --auth all --trust-yes 2>!
           info: or explicitly specify package libfoo version to manually satisfy these constraints
         EOE
 
-      $* libfoo/1.1.0 >'build libfoo/1.1.0';
+      $* libfoo/1.1.0 --keep-unused >'build libfoo/1.1.0';
 
       $pkg_disfigure libbar 2>'disfigured libbar/1.1.0';
       $pkg_purge     libbar 2>'purged libbar/1.1.0';
@@ -643,6 +643,8 @@ rep_fetch     += -d cfg --auth all --trust-yes 2>!
   : dependent-reconfiguration
   :
   {
+    test.arguments += --keep-unused
+
     +$clone_root_cfg
 
     +$pkg_fetch -e $src/libfoo-1.0.0.tar.gz && $pkg_unpack libfoo
@@ -1008,12 +1010,12 @@ rep_fetch     += -d cfg --auth all --trust-yes 2>!
 
     $* libbar 2>>~%EOE%;
       disfigured libbar/1.0.0
+      disfigured libfoo/1.0.0
+      purged libfoo/1.0.0
       %.*
       %.*fetched libbar/1.2.0%
       unpacked libbar/1.2.0
       configured libbar/1.2.0
-      disfigured libfoo
-      purged libfoo
       %info: .+dir\{libbar-1.2.0.\} is up to date%
       updated libbar/1.2.0
       EOE
@@ -1134,14 +1136,15 @@ rep_fetch     += -d cfg --auth all --trust-yes 2>!
       EOE
 
     $* libbar/1.2.0 <'y' 2>>~%EOE%;
+        drop libfoo/1.0.0 (unused)
         upgrade libbar/1.2.0
       continue? [Y/n] disfigured libbar/1.0.0
+      disfigured libfoo/1.0.0
+      purged libfoo/1.0.0
       %.*
       %.*fetched libbar/1.2.0%
       unpacked libbar/1.2.0
       configured libbar/1.2.0
-      disfigured libfoo
-      purged libfoo
       %info: .+ is up to date%
       updated libbar/1.2.0
       EOE
diff --git a/tests/pkg-drop.test b/tests/pkg-drop.test
index e10bbe2..438e12d 100644
--- a/tests/pkg-drop.test
+++ b/tests/pkg-drop.test
@@ -405,7 +405,7 @@ $* libfoo/1.0.0 2>>~%EOE% != 0
   {
     $clone_cfg && $pkg_build libbar;
 
-    $* libbar 2>>EOE
+    $* libbar --yes 2>>EOE
       disfigured libbar
       disfigured libfoo
       purged libbar
-- 
cgit v1.1