From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>
Cc: passt-dev@passt.top
Subject: Re: [PATCH 12/14] test: Use "nstool exec" to slightly simplify tests
Date: Thu, 6 Apr 2023 11:14:38 +1000 [thread overview]
Message-ID: <ZC4c/iqTERBrI8qm@yekko> (raw)
In-Reply-To: <20230405135912.4b40c5a0@elisabeth>
[-- Attachment #1: Type: text/plain, Size: 3062 bytes --]
On Wed, Apr 05, 2023 at 01:59:12PM +0200, Stefano Brivio wrote:
> On Tue, 4 Apr 2023 11:46:36 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
>
> > Using this, rather than using "nstool info" to get the pid then manually
> > connecting with nsenter makes things a little simpler.
> >
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> > ---
> > test/lib/context | 14 +++++++++-----
> > test/lib/setup | 33 +++++++++++++--------------------
> > test/run | 2 +-
> > 3 files changed, 23 insertions(+), 26 deletions(-)
> >
> > diff --git a/test/lib/context b/test/lib/context
> > index ee6b683..d9d8260 100644
> > --- a/test/lib/context
> > +++ b/test/lib/context
> > @@ -13,6 +13,8 @@
> > # Copyright Red Hat
> > # Author: David Gibson <david@gibson.dropbear.id.au>
> >
> > +NSTOOL="${BASEPATH}/nstool"
> > +
> > # context_setup_common() - Create outline of a new context
> > # $1: Context name
> > context_setup_common() {
> > @@ -30,15 +32,17 @@ context_setup_host() {
> > echo sh -c > "${__enter}"
> > }
> >
> > -# context_setup_nsenter() - Create a new context for running commands in a namespace
> > +# context_setup_nstool() - Create a new context for running commands with nstool exec
> > # $1: Context name
> > -# $2: Namespace PID
> > -context_setup_nsenter() {
> > +# $2: nstool control socket
> > +context_setup_nstool() {
> > __name="$1"
> > - shift
> > + __sock="$2"
> > __enter="${STATESETUP}/context_${__name}.enter"
> > + # Wait for the ns to be ready
> > + ${NSTOOL} info -w "${__sock}" > /dev/null
>
> Bad indentation here.
Fixed. Drat, emacs isn't doing what I expected here.
[snip]
> >
> > # teardown_two_guests() - Exit namespaces, kill qemu processes, passt and pasta
> > teardown_two_guests() {
> > - __ns1_pid=$(${NSTOOL} info -pw "${STATESETUP}/ns1.hold")
> > - __ns2_pid=$(${NSTOOL} info -pw "${STATESETUP}/ns2.hold")
> > - nsenter -U -p --preserve-credentials -t ${__ns1_pid} kill $(cat "${STATESETUP}/qemu_1.pid")
> > - nsenter -U -p --preserve-credentials -t ${__ns2_pid} kill $(cat "${STATESETUP}/qemu_2.pid")
> > + ${NSTOOL} exec ${STATESETUP}/ns1.hold -- kill $(cat "${STATESETUP}/qemu_1.pid")
> > + ${NSTOOL} exec ${STATESETUP}/ns2.hold -- kill $(cat "${STATESETUP}/qemu_2.pid")
> > context_wait qemu_1
> > context_wait qemu_2
> >
> > - nsenter -U -p --preserve-credentials -t ${__ns1_pid} kill $(cat "${STATESETUP}/passt_1.pid")
> > - nsenter -U -p --preserve-credentials -t ${__ns2_pid} kill $(cat "${STATESETUP}/passt_2.pid")
> > + ${NSTOOL} exec ${STATESETUP}/ns1.hold -- kill $(cat "${STATESETUP}/passt_1.pid")
> > + ${NSTOOL} exec ${STATESETUP}/ns2.hold -- kill $(cat "${STATESETUP}/passt_2.pid")
>
> ...and here.
Fixed here as well.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2023-04-06 2:50 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-04 1:46 [PATCH 00/14] Improved tool for testing across multiple namespaces David Gibson
2023-04-04 1:46 ` [PATCH 01/14] nstool: Rename nsholder to nstool David Gibson
2023-04-04 1:46 ` [PATCH 02/14] nstool: Reverse parameters " David Gibson
2023-04-04 1:46 ` [PATCH 03/14] nstool: Move description of its operation modes from comment to usage David Gibson
2023-04-05 11:56 ` Stefano Brivio
2023-04-06 0:10 ` David Gibson
2023-04-04 1:46 ` [PATCH 04/14] nstool: Split some command line parsing and socket setup to subcommands David Gibson
2023-04-05 11:58 ` Stefano Brivio
2023-04-06 2:31 ` David Gibson
2023-04-06 6:47 ` Stefano Brivio
2023-04-06 10:35 ` David Gibson
2023-04-04 1:46 ` [PATCH 05/14] nstool: Replace "pid" subcommand with "info" subcommand David Gibson
2023-04-05 11:58 ` Stefano Brivio
2023-04-06 0:13 ` David Gibson
2023-04-04 1:46 ` [PATCH 06/14] nstool: Detect what namespaces target is in David Gibson
2023-04-05 11:58 ` Stefano Brivio
2023-04-06 0:15 ` David Gibson
2023-04-04 1:46 ` [PATCH 07/14] nstool: Add magic number to advertized information David Gibson
2023-04-05 11:58 ` Stefano Brivio
2023-04-06 0:18 ` David Gibson
2023-04-04 1:46 ` [PATCH 08/14] nstool: Helpers to iterate through namespace types David Gibson
2023-04-05 11:58 ` Stefano Brivio
2023-04-06 0:55 ` David Gibson
2023-04-04 1:46 ` [PATCH 09/14] nstool: Add nstool exec command to execute commands in an nstool namespace David Gibson
2023-04-05 11:58 ` Stefano Brivio
2023-04-06 0:59 ` David Gibson
2023-04-04 1:46 ` [PATCH 10/14] nstool: Add --keep-caps option to nstool exec David Gibson
2023-04-05 11:59 ` Stefano Brivio
2023-04-06 1:11 ` David Gibson
2023-04-04 1:46 ` [PATCH 11/14] test: Initialise ${TRACE} properly David Gibson
2023-04-04 1:46 ` [PATCH 12/14] test: Use "nstool exec" to slightly simplify tests David Gibson
2023-04-05 11:59 ` Stefano Brivio
2023-04-06 1:14 ` David Gibson [this message]
2023-04-04 1:46 ` [PATCH 13/14] nstool: Advertise the holder's cwd (in its mountns) across the socket David Gibson
2023-04-04 1:46 ` [PATCH 14/14] nstool: Enter holder's cwd when changing mount ns with nstool exec David Gibson
2023-04-05 12:01 ` [PATCH 00/14] Improved tool for testing across multiple namespaces Stefano Brivio
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=ZC4c/iqTERBrI8qm@yekko \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/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).