| Message ID | 20190919171015.12681-6-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing/next (docker/podman, tcg, build fixes) | expand |
On Thu, Sep 19, 2019 at 06:10:04PM +0100, Alex Bennée wrote: > From: John Snow <jsnow@redhat.com> > > Oops; there's no argv here. > > Signed-off-by: John Snow <jsnow@redhat.com> > Message-Id: <20190913193821.17756-1-jsnow@redhat.com> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Cleber Rosa <crosa@redhat.com> Tested-by: Cleber Rosa <crosa@redhat.com> > --- > tests/docker/docker.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/docker/docker.py b/tests/docker/docker.py > index 4dca6006d2f..890e874ba93 100755 > --- a/tests/docker/docker.py > +++ b/tests/docker/docker.py > @@ -338,7 +338,7 @@ class Docker(object): > cmd = [ "-u", str(uid) ] + cmd > # podman requires a bit more fiddling > if self._command[0] == "podman": > - argv.insert(0, '--userns=keep-id') > + cmd.insert(0, '--userns=keep-id') > > ret = self._do_check(["run", "--label", > "com.qemu.instance.uuid=" + label] + cmd, > -- > 2.20.1 > >
diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 4dca6006d2f..890e874ba93 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -338,7 +338,7 @@ class Docker(object): cmd = [ "-u", str(uid) ] + cmd # podman requires a bit more fiddling if self._command[0] == "podman": - argv.insert(0, '--userns=keep-id') + cmd.insert(0, '--userns=keep-id') ret = self._do_check(["run", "--label", "com.qemu.instance.uuid=" + label] + cmd,