diff options
Diffstat (limited to 'recipes-containers/netavark/files')
-rw-r--r-- | recipes-containers/netavark/files/run-ptest | 8 | ||||
-rw-r--r-- | recipes-containers/netavark/files/tests.patch | 24 |
2 files changed, 32 insertions, 0 deletions
diff --git a/recipes-containers/netavark/files/run-ptest b/recipes-containers/netavark/files/run-ptest new file mode 100644 index 00000000..7e017ae2 --- /dev/null +++ b/recipes-containers/netavark/files/run-ptest @@ -0,0 +1,8 @@ +#!/bin/bash + +shopt -s extglob + +# Skip the plugin tests because those example plugins are built only while +# running cargo test and for this to work as a ptest they would need to be cross +# compiled and installed as part of the ptest. +NETAVARK=/usr/libexec/podman/netavark bats test/!(*-plugin.bats) diff --git a/recipes-containers/netavark/files/tests.patch b/recipes-containers/netavark/files/tests.patch new file mode 100644 index 00000000..3e1e9ed9 --- /dev/null +++ b/recipes-containers/netavark/files/tests.patch @@ -0,0 +1,24 @@ +Upstream-Status: Pending + +Index: git/test/helpers.bash +=================================================================== +--- git.orig/test/helpers.bash ++++ git/test/helpers.bash +@@ -575,7 +575,7 @@ + fi + + nsenter -n -t "${CONTAINER_NS_PIDS[$container_ns]}" timeout --foreground -v --kill=10 5 \ +- nc $nc_common_args -l -p $container_port &>"$NETAVARK_TMPDIR/nc-out" <$stdin & ++ ncat $nc_common_args -l -p $container_port &>"$NETAVARK_TMPDIR/nc-out" <$stdin & + + # make sure to wait until port is bound otherwise test can flake + # https://github.com/containers/netavark/issues/433 +@@ -588,7 +588,7 @@ + fi + + data=$(random_string) +- run_in_host_netns nc $nc_common_args $connect_ip $host_port <<<"$data" ++ run_in_host_netns ncat $nc_common_args $connect_ip $host_port <<<"$data" + + got=$(cat "$NETAVARK_TMPDIR/nc-out") + assert "$got" == "$data" "ncat received data" |