Skip to content

Commit 3f87f07

Browse files
committed
hack/bats: port it to use the new remote support
The system tests can setup their own server now so just use that and don't require the user to spawn its own. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
1 parent 950db09 commit 3f87f07

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

hack/bats

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ $0 is a wrapper for invoking podman system tests.
1212
1313
--root Run only as root
1414
--rootless Run only as user (i.e. you)
15-
--remote Run with podman-remote (see below)
15+
--remote Run with podman-remote
1616
1717
FILENAME-PATTERN Run only test files that match 'test/system/*name*',
1818
e.g. '500' or 'net' will match 500-networking.bats.
@@ -36,16 +36,6 @@ By default, tests ./bin/podman. To test a different podman, do:
3636
3737
\$ env PODMAN=/abs/path/to/podman $0 ....
3838
39-
To test podman-remote, start your own servers (root and rootless) via:
40-
41-
\$ bin/podman system service --timeout=0 &
42-
\$ sudo !!
43-
44-
...then invoke this script with --remote. (This script can't start the
45-
servers, because we can sudo *starting* the service but can't sudo
46-
stopping it: by the time the bats tests finish, the sudo timeout will
47-
have expired. We apologize for the inconvenience.)
48-
4939
Examples:
5040
5141
\$ $0 220:\"restart cleans up\"
@@ -113,13 +103,7 @@ if [[ "$REMOTE" ]]; then
113103
if ! [[ $PODMAN =~ -remote ]]; then
114104
PODMAN=${PODMAN}-remote
115105
fi
116-
117-
if [[ -n "$TEST_ROOT" ]]; then
118-
sudo $PODMAN info >/dev/null || exit 1
119-
fi
120-
if [[ -n "$TEST_ROOTLESS" ]]; then
121-
$PODMAN info >/dev/null || exit 1
122-
fi
106+
export REMOTESYSTEM_TRANSPORT=unix
123107
fi
124108

125109
# END initialization and command-line arg checking

0 commit comments

Comments
 (0)