public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top
Subject: [PATCH v2 22/32] test: Group tests by context then protocol, rather than the reverse
Date: Thu, 08 Sep 2022 16:16:11 +1000	[thread overview]
Message-ID: <20220908061621.2430844-23-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20220908061621.2430844-1-david@gibson.dropbear.id.au>

[-- Attachment #1: Type: text/plain, Size: 10144 bytes --]

e.g. passt/dhcp rather than dhcp/passt.  This is more consistent with the
two_guests and other test groups, and makes some other cleanups simpler.

Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
---
 test/{dhcp/passt => passt/dhcp}               |  2 +-
 test/{ndp/passt => passt/ndp}                 |  2 +-
 test/{shutdown/passt => passt/shutdown}       |  2 +-
 test/{tcp/passt => passt/tcp}                 |  2 +-
 test/{udp/passt => passt/udp}                 |  2 +-
 test/{icmp/passt_in_ns => passt_in_ns/icmp}   |  2 +-
 .../passt_in_ns => passt_in_ns/shutdown}      |  2 +-
 test/{tcp/passt_in_ns => passt_in_ns/tcp}     |  2 +-
 test/{udp/passt_in_ns => passt_in_ns/udp}     |  2 +-
 test/{dhcp/pasta => pasta/dhcp}               |  2 +-
 test/{ndp/pasta => pasta/ndp}                 |  2 +-
 test/{tcp/pasta => pasta/tcp}                 |  2 +-
 test/{udp/pasta => pasta/udp}                 |  2 +-
 test/run                                      | 38 +++++++++----------
 14 files changed, 32 insertions(+), 32 deletions(-)
 rename test/{dhcp/passt => passt/dhcp} (98%)
 rename test/{ndp/passt => passt/ndp} (95%)
 rename test/{shutdown/passt => passt/shutdown} (87%)
 rename test/{tcp/passt => passt/tcp} (98%)
 rename test/{udp/passt => passt/udp} (97%)
 rename test/{icmp/passt_in_ns => passt_in_ns/icmp} (94%)
 rename test/{shutdown/passt_in_ns => passt_in_ns/shutdown} (87%)
 rename test/{tcp/passt_in_ns => passt_in_ns/tcp} (99%)
 rename test/{udp/passt_in_ns => passt_in_ns/udp} (98%)
 rename test/{dhcp/pasta => pasta/dhcp} (96%)
 rename test/{ndp/pasta => pasta/ndp} (95%)
 rename test/{tcp/pasta => pasta/tcp} (98%)
 rename test/{udp/pasta => pasta/udp} (98%)

diff --git a/test/dhcp/passt b/test/passt/dhcp
similarity index 98%
rename from test/dhcp/passt
rename to test/passt/dhcp
index 37bf6b5..eef5183 100644
--- a/test/dhcp/passt
+++ b/test/passt/dhcp
@@ -6,7 +6,7 @@
 # PASTA - Pack A Subtle Tap Abstraction
 #  for network namespace/tap device mode
 #
-# test/dhcp/passt - Check DHCP and DHCPv6 functionality in passt mode
+# test/passt/dhcp - Check DHCP and DHCPv6 functionality in passt mode
 #
 # Copyright (c) 2021 Red Hat GmbH
 # Author: Stefano Brivio <sbrivio(a)redhat.com>
diff --git a/test/ndp/passt b/test/passt/ndp
similarity index 95%
rename from test/ndp/passt
rename to test/passt/ndp
index c73fd4d..280b3ae 100644
--- a/test/ndp/passt
+++ b/test/passt/ndp
@@ -6,7 +6,7 @@
 # PASTA - Pack A Subtle Tap Abstraction
 #  for network namespace/tap device mode
 #
-# test/ndp/passt - Check NDP functionality in passt mode
+# test/passt/ndp - Check NDP functionality in passt mode
 #
 # Copyright (c) 2021 Red Hat GmbH
 # Author: Stefano Brivio <sbrivio(a)redhat.com>
diff --git a/test/shutdown/passt b/test/passt/shutdown
similarity index 87%
rename from test/shutdown/passt
rename to test/passt/shutdown
index ac8ff08..ce90ea9 100644
--- a/test/shutdown/passt
+++ b/test/passt/shutdown
@@ -6,7 +6,7 @@
 # PASTA - Pack A Subtle Tap Abstraction
 #  for network namespace/tap device mode
 #
-# test/shutdown/passt - Shut down passt (or pasta) and check exit code (will
+# test/passt/shutdown - Shut down passt (or pasta) and check exit code (will
 #                       detect valgrind errors amongst others)
 #
 # Copyright (c) 2022 Red Hat GmbH
diff --git a/test/tcp/passt b/test/passt/tcp
similarity index 98%
rename from test/tcp/passt
rename to test/passt/tcp
index 265f270..d5c8164 100644
--- a/test/tcp/passt
+++ b/test/passt/tcp
@@ -6,7 +6,7 @@
 # PASTA - Pack A Subtle Tap Abstraction
 #  for network namespace/tap device mode
 #
-# test/tcp/passt - Check TCP functionality in passt mode
+# test/passt/tcp - Check TCP functionality in passt mode
 #
 # Copyright (c) 2021 Red Hat GmbH
 # Author: Stefano Brivio <sbrivio(a)redhat.com>
diff --git a/test/udp/passt b/test/passt/udp
similarity index 97%
rename from test/udp/passt
rename to test/passt/udp
index a14e6d2..56d01b3 100644
--- a/test/udp/passt
+++ b/test/passt/udp
@@ -6,7 +6,7 @@
 # PASTA - Pack A Subtle Tap Abstraction
 #  for network namespace/tap device mode
 #
-# test/udp/passt - Check UDP functionality in passt mode
+# test/passt/udp - Check UDP functionality in passt mode
 #
 # Copyright (c) 2021 Red Hat GmbH
 # Author: Stefano Brivio <sbrivio(a)redhat.com>
diff --git a/test/icmp/passt_in_ns b/test/passt_in_ns/icmp
similarity index 94%
rename from test/icmp/passt_in_ns
rename to test/passt_in_ns/icmp
index e4ac4ff..f326d4b 100644
--- a/test/icmp/passt_in_ns
+++ b/test/passt_in_ns/icmp
@@ -6,7 +6,7 @@
 # PASTA - Pack A Subtle Tap Abstraction
 #  for network namespace/tap device mode
 #
-# test/icmp/passt_in_ns - Check ICMP/ICMPv6 functionality for passt in ns
+# test/passt_in_ns/icmp - Check ICMP/ICMPv6 functionality for passt in ns
 #
 # Copyright (c) 2021 Red Hat GmbH
 # Author: Stefano Brivio <sbrivio(a)redhat.com>
diff --git a/test/shutdown/passt_in_ns b/test/passt_in_ns/shutdown
similarity index 87%
rename from test/shutdown/passt_in_ns
rename to test/passt_in_ns/shutdown
index 3808adb..abe9d6c 100644
--- a/test/shutdown/passt_in_ns
+++ b/test/passt_in_ns/shutdown
@@ -6,7 +6,7 @@
 # PASTA - Pack A Subtle Tap Abstraction
 #  for network namespace/tap device mode
 #
-# test/shutdown/passt_in_ns - Shut down passt and check exit code (will detect
+# test/passt_in_ns/shutdown - Shut down passt and check exit code (will detect
 #                             valgrind errors amongst others)
 #
 # Copyright (c) 2022 Red Hat GmbH
diff --git a/test/tcp/passt_in_ns b/test/passt_in_ns/tcp
similarity index 99%
rename from test/tcp/passt_in_ns
rename to test/passt_in_ns/tcp
index a248f00..5ec95e8 100644
--- a/test/tcp/passt_in_ns
+++ b/test/passt_in_ns/tcp
@@ -6,7 +6,7 @@
 # PASTA - Pack A Subtle Tap Abstraction
 #  for network namespace/tap device mode
 #
-# test/tcp/passt_in_ns - Check TCP functionality for passt in ns with pasta
+# test/passt_in_ns/tcp - Check TCP functionality for passt in ns with pasta
 #
 # Copyright (c) 2021 Red Hat GmbH
 # Author: Stefano Brivio <sbrivio(a)redhat.com>
diff --git a/test/udp/passt_in_ns b/test/passt_in_ns/udp
similarity index 98%
rename from test/udp/passt_in_ns
rename to test/passt_in_ns/udp
index d5f08fe..c22a68f 100644
--- a/test/udp/passt_in_ns
+++ b/test/passt_in_ns/udp
@@ -6,7 +6,7 @@
 # PASTA - Pack A Subtle Tap Abstraction
 #  for network namespace/tap device mode
 #
-# test/udp/passt_in_ns - Check UDP functionality for passt in ns and pasta
+# test/passt_in_ns/udp - Check UDP functionality for passt in ns and pasta
 #
 # Copyright (c) 2021 Red Hat GmbH
 # Author: Stefano Brivio <sbrivio(a)redhat.com>
diff --git a/test/dhcp/pasta b/test/pasta/dhcp
similarity index 96%
rename from test/dhcp/pasta
rename to test/pasta/dhcp
index d1e9611..80eabf5 100644
--- a/test/dhcp/pasta
+++ b/test/pasta/dhcp
@@ -6,7 +6,7 @@
 # PASTA - Pack A Subtle Tap Abstraction
 #  for network namespace/tap device mode
 #
-# test/dhcp/pasta - Check DHCP and DHCPv6 functionality in pasta mode
+# test/pasta/dhcp - Check DHCP and DHCPv6 functionality in pasta mode
 #
 # Copyright (c) 2021 Red Hat GmbH
 # Author: Stefano Brivio <sbrivio(a)redhat.com>
diff --git a/test/ndp/pasta b/test/pasta/ndp
similarity index 95%
rename from test/ndp/pasta
rename to test/pasta/ndp
index d776055..d2b2c0b 100644
--- a/test/ndp/pasta
+++ b/test/pasta/ndp
@@ -6,7 +6,7 @@
 # PASTA - Pack A Subtle Tap Abstraction
 #  for network namespace/tap device mode
 #
-# test/ndp/pasta - Check DHCP and DHCPv6 functionality in pasta mode
+# test/pasta/ndp - Check DHCP and DHCPv6 functionality in pasta mode
 #
 # Copyright (c) 2021 Red Hat GmbH
 # Author: Stefano Brivio <sbrivio(a)redhat.com>
diff --git a/test/tcp/pasta b/test/pasta/tcp
similarity index 98%
rename from test/tcp/pasta
rename to test/pasta/tcp
index a13a2ff..7c7de06 100644
--- a/test/tcp/pasta
+++ b/test/pasta/tcp
@@ -6,7 +6,7 @@
 # PASTA - Pack A Subtle Tap Abstraction
 #  for network namespace/tap device mode
 #
-# test/tcp/pasta - Check TCP functionality for pasta
+# test/pasta/tcp - Check TCP functionality for pasta
 #
 # Copyright (c) 2021 Red Hat GmbH
 # Author: Stefano Brivio <sbrivio(a)redhat.com>
diff --git a/test/udp/pasta b/test/pasta/udp
similarity index 98%
rename from test/udp/pasta
rename to test/pasta/udp
index 0767e0b..0e58152 100644
--- a/test/udp/pasta
+++ b/test/pasta/udp
@@ -6,7 +6,7 @@
 # PASTA - Pack A Subtle Tap Abstraction
 #  for network namespace/tap device mode
 #
-# test/udp/pasta - Check UDP functionality for pasta
+# test/pasta/udp - Check UDP functionality for pasta
 #
 # Copyright (c) 2021 Red Hat GmbH
 # Author: Stefano Brivio <sbrivio(a)redhat.com>
diff --git a/test/run b/test/run
index 0ec1334..d8b60bf 100755
--- a/test/run
+++ b/test/run
@@ -74,40 +74,40 @@ run() {
 	teardown distro
 
 	setup pasta
-	test ndp/pasta
-	test dhcp/pasta
-	test tcp/pasta
-	test udp/pasta
-	test shutdown/passt
+	test pasta/ndp
+	test pasta/dhcp
+	test pasta/tcp
+	test pasta/udp
+	test passt/shutdown
 	teardown pasta
 
 	setup passt
-	test ndp/passt
-	test dhcp/passt
-	test tcp/passt
-	test udp/passt
-	test shutdown/passt
+	test passt/ndp
+	test passt/dhcp
+	test passt/tcp
+	test passt/udp
+	test passt/shutdown
 	teardown passt
 
 	VALGRIND=1
 	setup passt_in_ns
-	test ndp/passt
-	test dhcp/passt
-	test icmp/passt_in_ns
-	test tcp/passt_in_ns
-	test udp/passt_in_ns
-	test shutdown/passt_in_ns
+	test passt/ndp
+	test passt/dhcp
+	test passt_in_ns/icmp
+	test passt_in_ns/tcp
+	test passt_in_ns/udp
+	test passt_in_ns/shutdown
 	teardown passt_in_ns
 
 	VALGRIND=0
 	setup passt_in_ns
-	test ndp/passt
-	test dhcp/passt
+	test passt/ndp
+	test passt/dhcp
 	test perf/passt_tcp
 	test perf/passt_udp
 	test perf/pasta_tcp
 	test perf/pasta_udp
-	test shutdown/passt_in_ns
+	test passt_in_ns/shutdown
 	teardown passt_in_ns
 
 	setup two_guests
-- 
@@ -74,40 +74,40 @@ run() {
 	teardown distro
 
 	setup pasta
-	test ndp/pasta
-	test dhcp/pasta
-	test tcp/pasta
-	test udp/pasta
-	test shutdown/passt
+	test pasta/ndp
+	test pasta/dhcp
+	test pasta/tcp
+	test pasta/udp
+	test passt/shutdown
 	teardown pasta
 
 	setup passt
-	test ndp/passt
-	test dhcp/passt
-	test tcp/passt
-	test udp/passt
-	test shutdown/passt
+	test passt/ndp
+	test passt/dhcp
+	test passt/tcp
+	test passt/udp
+	test passt/shutdown
 	teardown passt
 
 	VALGRIND=1
 	setup passt_in_ns
-	test ndp/passt
-	test dhcp/passt
-	test icmp/passt_in_ns
-	test tcp/passt_in_ns
-	test udp/passt_in_ns
-	test shutdown/passt_in_ns
+	test passt/ndp
+	test passt/dhcp
+	test passt_in_ns/icmp
+	test passt_in_ns/tcp
+	test passt_in_ns/udp
+	test passt_in_ns/shutdown
 	teardown passt_in_ns
 
 	VALGRIND=0
 	setup passt_in_ns
-	test ndp/passt
-	test dhcp/passt
+	test passt/ndp
+	test passt/dhcp
 	test perf/passt_tcp
 	test perf/passt_udp
 	test perf/pasta_tcp
 	test perf/pasta_udp
-	test shutdown/passt_in_ns
+	test passt_in_ns/shutdown
 	teardown passt_in_ns
 
 	setup two_guests
-- 
2.37.3


  parent reply	other threads:[~2022-09-08  6:16 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-08  6:15 [PATCH v2 00/32] Improve handling of test temporary files David Gibson
2022-09-08  6:15 ` [PATCH v2 01/32] test: Correctly match "background" with "wait" commands David Gibson
2022-09-08  6:15 ` [PATCH v2 02/32] test: Context execution helpers David Gibson
2022-09-08  6:15 ` [PATCH v2 03/32] test: Allow a tmux pane to watch commands executed in contexts David Gibson
2022-09-08  6:15 ` [PATCH v2 04/32] test: Integration of old-style pane execution and new context execution David Gibson
2022-09-08  6:15 ` [PATCH v2 05/32] test: Issue host commands via context for most tests David Gibson
2022-09-08  6:15 ` [PATCH v2 06/32] test: Use new-style contexts for passt pane in the pasta and passt tests David Gibson
2022-09-08  6:15 ` [PATCH v2 07/32] test: Add nsholder utility David Gibson
2022-09-08  6:15 ` [PATCH v2 08/32] test: Extend context system to run commands in namespace for pasta tests David Gibson
2022-09-08  6:15 ` [PATCH v2 09/32] test: Use context system for guest commands David Gibson
2022-09-08  6:15 ` [PATCH v2 10/32] test: Use context system for two_guests tests David Gibson
2022-09-08  6:16 ` [PATCH v2 11/32] test: Use new-style command issue for passt_in_ns tests David Gibson
2022-09-08  6:16 ` [PATCH v2 12/32] Don't store UID & GID persistently in the context structure David Gibson
2022-09-08  6:16 ` [PATCH v2 13/32] Split checking for root from dropping root privilege David Gibson
2022-09-08  6:16 ` [PATCH v2 14/32] Consolidate determination of UID/GID to run as David Gibson
2022-09-08  6:16 ` [PATCH v2 15/32] Safer handling if we can't open /proc/self/uid_map David Gibson
2022-09-08  6:16 ` [PATCH v2 16/32] Move self-isolation code into a separate file David Gibson
2022-09-08  6:16 ` [PATCH v2 17/32] Consolidate validation of pasta namespace options David Gibson
2022-09-08  6:16 ` [PATCH v2 18/32] Clean up and rename conf_ns_open() David Gibson
2022-09-08  6:16 ` [PATCH v2 19/32] Correctly handle --netns-only in pasta_start_ns() David Gibson
2022-09-08  6:16 ` [PATCH v2 20/32] Handle userns isolation and dropping root at the same time David Gibson
2022-09-08  6:16 ` [PATCH v2 21/32] Allow --userns when pasta spawns a command David Gibson
2022-09-08  6:16 ` David Gibson [this message]
2022-09-08  6:16 ` [PATCH v2 23/32] test: Remove unused variable FFMPEG_PID_FILE David Gibson
2022-09-08  6:16 ` [PATCH v2 24/32] test: Actually run cleanup function David Gibson
2022-09-08  6:16 ` [PATCH v2 25/32] test: Create common state directories for temporary files David Gibson
2022-09-08  6:16 ` [PATCH v2 26/32] test: Move context temporary files to state dir David Gibson
2022-09-08  6:16 ` [PATCH v2 27/32] test: Dont regnerate small test file in pasta/tcp David Gibson
2022-09-08  6:16 ` [PATCH v2 28/32] test: Use paths in __STATEDIR__ instead of 'temp' and 'tempdir' directives David Gibson
2022-09-08  6:16 ` [PATCH v2 29/32] test: Move pause temporary file to state directory David Gibson
2022-09-08  6:16 ` [PATCH v2 30/32] test: Store pcap files in $LOGDIR instead of /tmp David Gibson
2022-09-08  6:16 ` [PATCH v2 31/32] test: Move pidfiles and nsholder sockets into state directory David Gibson
2022-09-08  6:16 ` [PATCH v2 32/32] test: Move video processing files to $STATEBASE David Gibson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220908061621.2430844-23-david@gibson.dropbear.id.au \
    --to=david@gibson.dropbear.id.au \
    --cc=passt-dev@passt.top \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).