[libvirt PATCH 13/14] tests: Set SASLdirs to default values

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



We use standard paths for almost everything else.

Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
 tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args | 2 +-
 tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args   | 2 +-
 .../graphics-vnc-tls-secret.x86_64-5.2.0.args                 | 2 +-
 .../graphics-vnc-tls-secret.x86_64-latest.args                | 2 +-
 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args    | 2 +-
 tests/testutilsqemu.c                                         | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args
index 5e0a6f28a0..2700493826 100644
--- a/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/etc/sasl2 \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args
index 6f7cf2eb21..2bc599d1c8 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/etc/sasl2 \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
index fb3ebd8f5a..9e4e16b888 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
@@ -6,7 +6,7 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/etc/sasl2 \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
index d7e577797e..c564bd9d9b 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/etc/sasl2 \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
index a9371d1786..8ad660e11f 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/etc/sasl2 \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 663ea44e89..1fabd8764e 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -699,9 +699,9 @@ int qemuTestDriverInit(virQEMUDriver *driver)
     cfg->backupTLSx509certdir = g_strdup("/etc/pki/libvirt-backup");
 
     VIR_FREE(cfg->vncSASLdir);
-    cfg->vncSASLdir = g_strdup("/root/.sasl2");
+    cfg->vncSASLdir = g_strdup("/etc/sasl2");
     VIR_FREE(cfg->spiceSASLdir);
-    cfg->spiceSASLdir = g_strdup("/root/.sasl2");
+    cfg->spiceSASLdir = g_strdup("/etc/sasl2");
 
     VIR_FREE(cfg->spicePassword);
     cfg->spicePassword = g_strdup("123456");
-- 
2.39.2




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux