aboutsummaryrefslogtreecommitdiffstats
path: root/node-admin/src/test
diff options
context:
space:
mode:
authorbjormel <bjormel@verizonmedia.com>2022-12-14 09:11:43 +0100
committerbjormel <bjormel@verizonmedia.com>2022-12-14 09:11:43 +0100
commit953119e86a0db62ae102c477da70e0e9ab78b1a8 (patch)
tree002efb87d0239f690638a481e66f1eca0723ed63 /node-admin/src/test
parente6d1557b65b948f46110ff1d108d11dfcd1edaf4 (diff)
default '--disablerepo=*'
Diffstat (limited to 'node-admin/src/test')
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java
index 8c9e36abb32..e52dedbf7ef 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java
@@ -99,7 +99,7 @@ public class YumTest {
void testAlreadyInstalled() {
mockRpmQuery("package-1", null);
terminal.expectCommand(
- "yum install --assumeyes --enablerepo=repo1 --enablerepo=repo2 --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
+ "yum install --assumeyes \"--disablerepo=*\" --enablerepo=repo1 --enablerepo=repo2 --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
0,
"foobar\nNothing to do.\n"); // Note trailing dot
assertFalse(yum.install("package-1", "package-2")
@@ -161,7 +161,7 @@ public class YumTest {
void testInstallWithEnablerepo() {
mockRpmQuery("package-1", null);
terminal.expectCommand(
- "yum install --assumeyes --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
+ "yum install --assumeyes \"--disablerepo=*\" --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
0,
"installing, installing");
@@ -201,10 +201,10 @@ public class YumTest {
terminal.expectCommand("yum versionlock delete \"package-0:0.1-8.el7.*\" 2>&1");
- terminal.expectCommand("yum versionlock add --assumeyes --enablerepo=somerepo \"package-0:0.10-654.el7.*\" 2>&1");
+ terminal.expectCommand("yum versionlock add --assumeyes \"--disablerepo=*\" --enablerepo=somerepo \"package-0:0.10-654.el7.*\" 2>&1");
terminal.expectCommand(
- "yum install --assumeyes --enablerepo=somerepo package-0:0.10-654.el7 2>&1",
+ "yum install --assumeyes \"--disablerepo=*\" --enablerepo=somerepo package-0:0.10-654.el7 2>&1",
0,
"Nothing to do\n");
@@ -254,7 +254,7 @@ public class YumTest {
assertThrows(ChildProcessFailureException.class, () -> {
mockRpmQuery("package-1", null);
terminal.expectCommand(
- "yum install --assumeyes --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
+ "yum install --assumeyes \"--disablerepo=*\" --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
1,
"error");