summaryrefslogtreecommitdiffstats
path: root/recipes-containers/netavark/files/tests.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-containers/netavark/files/tests.patch')
-rw-r--r--recipes-containers/netavark/files/tests.patch15
1 files changed, 10 insertions, 5 deletions
diff --git a/recipes-containers/netavark/files/tests.patch b/recipes-containers/netavark/files/tests.patch
index c4b3618f..3e1e9ed9 100644
--- a/recipes-containers/netavark/files/tests.patch
+++ b/recipes-containers/netavark/files/tests.patch
@@ -1,16 +1,21 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3diff --git a/test/helpers.bash b/test/helpers.bash 3Index: git/test/helpers.bash
4index 89866ec..017b2b5 100644 4===================================================================
5--- a/test/helpers.bash 5--- git.orig/test/helpers.bash
6+++ b/test/helpers.bash 6+++ git/test/helpers.bash
7@@ -552,10 +552,10 @@ function run_nc_test() { 7@@ -575,7 +575,7 @@
8 fi 8 fi
9 9
10 nsenter -n -t "${CONTAINER_NS_PIDS[$container_ns]}" timeout --foreground -v --kill=10 5 \ 10 nsenter -n -t "${CONTAINER_NS_PIDS[$container_ns]}" timeout --foreground -v --kill=10 5 \
11- nc $nc_common_args -l -p $container_port &>"$NETAVARK_TMPDIR/nc-out" <$stdin & 11- nc $nc_common_args -l -p $container_port &>"$NETAVARK_TMPDIR/nc-out" <$stdin &
12+ ncat $nc_common_args -l -p $container_port &>"$NETAVARK_TMPDIR/nc-out" <$stdin & 12+ ncat $nc_common_args -l -p $container_port &>"$NETAVARK_TMPDIR/nc-out" <$stdin &
13 13
14 # make sure to wait until port is bound otherwise test can flake
15 # https://github.com/containers/netavark/issues/433
16@@ -588,7 +588,7 @@
17 fi
18
14 data=$(random_string) 19 data=$(random_string)
15- run_in_host_netns nc $nc_common_args $connect_ip $host_port <<<"$data" 20- run_in_host_netns nc $nc_common_args $connect_ip $host_port <<<"$data"
16+ run_in_host_netns ncat $nc_common_args $connect_ip $host_port <<<"$data" 21+ run_in_host_netns ncat $nc_common_args $connect_ip $host_port <<<"$data"