Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
tests: fix when running in jails
Baptiste Daroussin committed 6 months ago
commit 232453bc9984073b8537eff4c47522991c36e20f
parent 844bc37
1 file changed +14 -14
modified tests/frontend/conflicts.sh
@@ -152,12 +152,12 @@ Installed packages to be REMOVED:
Number of packages to be removed: 1
Number of packages to be installed: 1
Number of packages to be upgraded: 1
-
[1/4] Deinstalling foo-1.0...
-
[2/4] Deinstalling bar-1.0...
-
[2/4] Deleting files for bar-1.0:  done
-
[3/4] Installing bar1-1.1...
-
[3/4] Extracting bar1-1.1:  done
-
[4/4] Installing foo-1.0_1...
+
${JAILED}[1/4] Deinstalling foo-1.0...
+
${JAILED}[2/4] Deinstalling bar-1.0...
+
${JAILED}[2/4] Deleting files for bar-1.0:  done
+
${JAILED}[3/4] Installing bar1-1.1...
+
${JAILED}[3/4] Extracting bar1-1.1:  done
+
${JAILED}[4/4] Installing foo-1.0_1...
"

	atf_check \
@@ -355,14 +355,14 @@ Installed packages to be REMOVED:
Number of packages to be removed: 2
Number of packages to be installed: 2
Number of packages to be upgraded: 1
-
[1/6] Deinstalling other-1.0...
-
[2/6] Deinstalling foo-1.0...
-
[3/6] Deinstalling bar-1.0...
-
[3/6] Deleting files for bar-1.0:  done
-
[4/6] Installing bar1-1.1...
-
[4/6] Extracting bar1-1.1:  done
-
[5/6] Installing foo-1.0_1...
-
[6/6] Installing arp-1.0_1...
+
${JAILED}[1/6] Deinstalling other-1.0...
+
${JAILED}[2/6] Deinstalling foo-1.0...
+
${JAILED}[3/6] Deinstalling bar-1.0...
+
${JAILED}[3/6] Deleting files for bar-1.0:  done
+
${JAILED}[4/6] Installing bar1-1.1...
+
${JAILED}[4/6] Extracting bar1-1.1:  done
+
${JAILED}[5/6] Installing foo-1.0_1...
+
${JAILED}[6/6] Installing arp-1.0_1...
"

	atf_check \