meta-virtualization/recipes-containers/netavark/files/tests.patch
Bruce Ashfield 4b7ae4b6e9 netavark: update to v1.11.0
Bumping netavark to version v1.11.0-34-ge182147, which comprises the following commits:

    ab4f101 Release v1.11.0
    8d63716 Update release notes for 1.11.0
    8c28d20 update netlink-packet-route to 0.20.0
    46e4559 run cargo update
    38d0ab1 fix: remove extra / in make install and uninstall
    4fb2bd9 chore(deps): update dependency containers/automation_images to v20240529
    3ec4fd7 fix(deps): update rust crate nix to 0.29.0
    e87aae4 fix(deps): update rust crate nispor to 1.2.19
    ecfae2c fix(deps): update rust crate anyhow to 1.0.86
    6f445a5 fix(deps): update rust crate anyhow to 1.0.85
    e5514d1 [skip-ci] Packit: do not create dup jobs on podman-next
    f27cd29 fix(deps): update rust crate anyhow to 1.0.84
    abdd8ec [skip-ci] RPM: use default __cargo macro across all envs
    c29c09c [skip-ci] RPM: switch default firewall to nftables on EL10+
    79bdee1 chore(deps): update dependency containers/automation_images to v20240513
    b161e75 Add conditional compilation of default firewall driver
    7f69bae fix(deps): update rust crate serde_json to 1.0.117
    87fe59f fix new clippy warnings
    ed7cfd8 Update CI image to fedora 40
    e6c6d99 fix ncat sctp tests
    ad5adfc fix(deps): update rust crate anyhow to 1.0.83
    b04b3de build(deps): bump h2 from 0.3.25 to 0.3.26
    da57e62 [skip-ci] Packit: distinct `-rhel` packages value
    5e1484c [skip-ci] Packit: enable c10s downstream sync
    4233d47 fix(deps): update rust crate libc to 0.2.154
    42c6735 fix(deps): update rust crate ipnet to 2.9.0
    5869654 fix(deps): update rust crate tower to 0.4.13
    7c575c5 fix(deps): update rust crate tokio-stream to 0.1.15
    93b8c98 fix(deps): update rust crate prost to 0.12.4
    8242916 fix(deps): update rust crate iptables to 0.5.1
    41c3281 [skip-ci] Packit: remove el8 jobs
    16de016 fix(deps): update rust crate anyhow to 1.0.82
    8f5cbf3 fix(deps): update rust crate serde to 1.0.199
    0e03c7c Add suffix to Aardvark internal network filenames
    9a73a52 fix port forward with strict RPF and multi networks
    6e19894 renovate: stop rebasing PRs automatically
    f2f137f chore(deps): update rust crate chrono to 0.4.38
    ded8d36 fix(deps): update rust crate serde_json to 1.0.116
    0ce4586 fix(deps): update rust crate netlink-sys to 0.8.6
    055b37e nftables: only dump netavark table rules
    42c634f update nftables to 0.4
    b2bcf47 fix aardvark-dns netns check
    c309491 fix(deps): update rust crate tokio to 1.37
    1df8633 fix(deps): update rust crate netlink-packet-route to 0.19.0
    4846563 Update to nix-0.28.0
    e506776 fix(deps): update rust crate mozim to 0.2.3
    a76f3d9 fix(deps): update rust crate nispor to 1.2.18
    829b2db Update chrono
    cae2d5e fix(deps): update rust crate serde_json to 1.0.115
    92bd069 build(deps): bump mio from 0.8.9 to 0.8.11
    1e10e01 [skip-ci] rpm: aardvark-dns is a hard dep across the board
    131c28c Update Rust crate env_logger to 0.11.3
    370722f Update Rust crate serde to 1.0.197
    6288762 Update Rust crate tempfile to 3.10.1
    6d67358 Update Rust crate log to 0.4.21
    943cd88 Update Rust crate zbus to 3.15.2
    1a5850a Update Rust crate serde_json to 1.0.114
    fe40711 Update Rust crate env_logger to 0.11.2
    1efb4e5 Update Rust crate chrono to 0.4.34
    5601e0a Update Rust crate tonic-build to 0.11
    09ccedc Update Rust crate tonic to 0.11
    bba73d6 fix netavark update to not start a new aardvark-dns
    37d6f55 Update Rust crate tempfile to 3.10.0
    8c2c8c6 Update Rust crate zbus to 3.15.0
    dd1a057 Update Rust crate tokio to 1.36
    b6be4de Update Rust crate chrono to 0.4.33
    45f1581 Do not perform network namespace detection on AV update
    6c69f60 [CI:BUILD] Packit/rpm: fix aardvark-dns handling
    733a785 Update Rust crate serde_json to 1.0.113
    6786828 Update Rust crate serde_json to 1.0.112
    c5a23fc Update Rust crate env_logger to 0.11.1
    d8143a6 update README with nftables support
    c5acdec Bump to v1.11.0-dev
    468f885 perf-netavark: accept fw driver as argument
    61a990f perf-netavark: fix missing --config arg

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2024-07-16 13:59:25 +00:00

25 lines
920 B
Diff

Upstream-Status: Pending
Index: git/test/helpers.bash
===================================================================
--- git.orig/test/helpers.bash
+++ git/test/helpers.bash
@@ -645,7 +645,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
@@ -658,7 +658,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"