sbotools2

commit 70a7508791aebd0cfa623ecdbd56e072629f799c
parent c405a7a9e9d1843ed9977ab3d001558891a4213d
Author: Andreas Guldstrand <andreas.guldstrand@gmail.com>
Date:   Sat, 10 Sep 2016 14:07:10 +0200

05-upgrade.t: tests will fail if nesb2 is mistakenly already installed, so clean it up

Diffstat:
M
t/05-upgrade.t
 | 
7
+++++++

1 file changed, 7 insertions(+), 0 deletions(-)
diff --git a/t/05-upgrade.t b/t/05-upgrade.t
@@ -20,16 +20,19 @@ $ENV{TEST_ONLINE} //= 0;
 sub cleanup {
 	capture_merged {
 		system(qw!/sbin/removepkg nonexistentslackbuild!);
+		system(qw!/sbin/removepkg nonexistentslackbuild2!);
 		system(qw!/sbin/removepkg nonexistentslackbuild4!);
 		system(qw!/sbin/removepkg nonexistentslackbuild5!);
 		system(qw!/sbin/removepkg nonexistentslackbuild6!);
 		system(qw!/sbin/removepkg weird-versionsbo!);
 		unlink "$RealBin/LO/nonexistentslackbuild/perf.dummy";
+		unlink "$RealBin/LO/nonexistentslackbuild2/perf.dummy";
 		unlink "$RealBin/LO/nonexistentslackbuild4/perf.dummy";
 		unlink "$RealBin/LO/nonexistentslackbuild5/perf.dummy";
 		unlink "$RealBin/LO/nonexistentslackbuild6/perf.dummy";
 		unlink "$RealBin/LO/weird-versionsbo/perf.dummy";
 		unlink "$RealBin/LO2/nonexistentslackbuild/perf.dummy";
+		unlink "$RealBin/LO2/nonexistentslackbuild2/perf.dummy";
 		unlink "$RealBin/LO2/nonexistentslackbuild4/perf.dummy";
 		unlink "$RealBin/LO2/nonexistentslackbuild5/perf.dummy";
 		unlink "$RealBin/LO2/nonexistentslackbuild6/perf.dummy";
@@ -37,19 +40,23 @@ sub cleanup {
 		unlink "$RealBin/LO3/nonexistentslackbuild4/perf.dummy";
 		unlink "$RealBin/LO3/nonexistentslackbuild5/perf.dummy";
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild-0.9!);
+		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild2-0.9!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild4-0.9!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild5-0.9!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild6-0.9!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild-1.0!);
+		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild2-1.0!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild4-1.0!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild5-1.0!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild6-1.0!);
 		system(qw!rm -rf /tmp/SBo/weird-versionsbo-1.0!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild-1.1!);
+		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild2-1.1!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild4-1.1!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild5-1.1!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild6-1.1!);
 		system(qw!rm -rf /tmp/package-nonexistentslackbuild!);
+		system(qw!rm -rf /tmp/package-nonexistentslackbuild2!);
 		system(qw!rm -rf /tmp/package-nonexistentslackbuild4!);
 		system(qw!rm -rf /tmp/package-nonexistentslackbuild5!);
 		system(qw!rm -rf /tmp/package-nonexistentslackbuild6!);