aboutgitcodebugslistschat
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2022-07-06 17:29:09 +1000
committerStefano Brivio <sbrivio@redhat.com>2022-07-14 01:36:05 +0200
commit30ac86823ba0f4b80e83a6bd8ccc562f0d79b9c9 (patch)
treeb2da60b54d1f7f08cc78c655b3e31c823f48376a
parentd2802ec874fd70b4c4dda6158f63612d6f1bffc0 (diff)
downloadpasst-30ac86823ba0f4b80e83a6bd8ccc562f0d79b9c9.tar
passt-30ac86823ba0f4b80e83a6bd8ccc562f0d79b9c9.tar.gz
passt-30ac86823ba0f4b80e83a6bd8ccc562f0d79b9c9.tar.bz2
passt-30ac86823ba0f4b80e83a6bd8ccc562f0d79b9c9.tar.lz
passt-30ac86823ba0f4b80e83a6bd8ccc562f0d79b9c9.tar.xz
passt-30ac86823ba0f4b80e83a6bd8ccc562f0d79b9c9.tar.zst
passt-30ac86823ba0f4b80e83a6bd8ccc562f0d79b9c9.zip
tests: Remove unused DNS6 calculation from fedora tests
The Fedora test file extracts some information from the host resolv.conf into a DNS6 variable which is then never used. Remove this unnecessary step, which is presumably a leftover from an earlier iteration. This was the only user of 'head' and 'sed' in the test file, so those can also be removed from the required tools. The debian and ubuntu test files also listed 'head' and 'sed' as tools, although they don't use them, I'm guessing because of an earlier version which had the same DNS6 code. Remove those as well. The opensuse test file still actually uses DNS6, so leave it there for now. The DNS handling and network config handling for SuSE looks to be kind of broken, but fixing that is a job for another day. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--test/distro/debian2
-rw-r--r--test/distro/fedora3
-rw-r--r--test/distro/ubuntu2
3 files changed, 3 insertions, 4 deletions
diff --git a/test/distro/debian b/test/distro/debian
index ad0ec30..abbbaa2 100644
--- a/test/distro/debian
+++ b/test/distro/debian
@@ -12,7 +12,7 @@
# Author: Stefano Brivio <sbrivio@redhat.com>
temp PIDFILE
-htools head sed cat kill qemu-system-x86_64 qemu-system-aarch64 qemu-system-ppc64
+htools cat kill qemu-system-x86_64 qemu-system-aarch64 qemu-system-ppc64
# Quick pasta test: send message from init to ns, and from ns to init
def distro_quick_pasta_test
diff --git a/test/distro/fedora b/test/distro/fedora
index f225a8e..56805c5 100644
--- a/test/distro/fedora
+++ b/test/distro/fedora
@@ -12,7 +12,7 @@
# Author: Stefano Brivio <sbrivio@redhat.com>
temp PIDFILE
-htools head sed cat kill qemu-system-x86_64
+htools cat kill qemu-system-x86_64
# Quick pasta test: send message from init to ns, and from ns to init
def distro_quick_pasta_test
@@ -59,7 +59,6 @@ endef
hostb ./passt -P __PIDFILE__ &
sleep 1
host echo
-hout DNS6 sed -n 's/^nameserver \([^:]*:\)\([^%]*\).*/\1\2/p' /etc/resolv.conf | head -1
test Fedora 26, x86_64
diff --git a/test/distro/ubuntu b/test/distro/ubuntu
index 3a80e37..b9a0446 100644
--- a/test/distro/ubuntu
+++ b/test/distro/ubuntu
@@ -12,7 +12,7 @@
# Author: Stefano Brivio <sbrivio@redhat.com>
temp PIDFILE
-htools qemu-img virt-edit guestfish head sed cat kill qemu-system-x86_64 qemu-system-ppc64 qemu-system-s390x
+htools qemu-img virt-edit guestfish cat kill qemu-system-x86_64 qemu-system-ppc64 qemu-system-s390x
# Quick pasta test: send message from init to ns, and from ns to init
def distro_quick_pasta_test