Skip to contentSkip to conversation

netavark: require iputils for ptest

PATCH In review [email protected] 3 participants 4 messages Aug 25, 2023 – Apr 24, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 netavark: require iputils for ptest

From: Patrick Wicki <[email protected]>

Fixes ptest not working on systems using busybox ping.

---
 recipes-containers/netavark/netavark_1.7.0.bb | 2 ++
 1 file changed, 2 insertions(+)
recipes-containers/netavark/netavark_1.7.0.bb +2 -0
index 43c3ee5f..490d8762 100644
@@ -44,6 +44,7 @@ DEPENDS += "protobuf-c-native protobuf-c"
 # bind-utils is used to install dig
 # procps-ps is necessary because the ps from busybox is
 # not having the same behavior
+# iputils is used because busybox ping behaves differently
 RDEPENDS:${PN}-ptest += " \
     bash \
     bats \
@@ -51,6 +52,7 @@ RDEPENDS:${PN}-ptest += " \
     coreutils \
     dbus-daemon-proxy \
     iproute2 \
+    iputils \
     jq \
     nmap \
     procps-ps \
Signature · 1 line
2.41.0
#1 lore raw

PATCH 2/2 netavark: skip plugins in ptest

From: Patrick Wicki <[email protected]>

Skip the plugin tests that were introduced in 1.6.0 and lead to ptest failure.

---
 recipes-containers/netavark/files/run-ptest | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
recipes-containers/netavark/files/run-ptest +6 -1
index 41a37dce..7e017ae2 100644
@@ -1,3 +1,8 @@
 #!/bin/bash
 
-NETAVARK=/usr/libexec/podman/netavark bats ./test/
+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)
Signature · 1 line
2.41.0
#2 lore raw

Thanks for doing this against master-next!

I'm out of the office for another week, but have put this onto master-next and will complete the merges once I'm fully back to the office.

Bruce

In message: [meta-virtualization][PATCH 1/2] netavark: require iputils for ptest

Quoted 42 lines · on 25/08/2023 [email protected] wrote:

From: Patrick Wicki <[email protected]>

Fixes ptest not working on systems using busybox ping.

---
 recipes-containers/netavark/netavark_1.7.0.bb | 2 ++
 1 file changed, 2 insertions(+)
recipes-containers/netavark/netavark_1.7.0.bb +2 -0
index 43c3ee5f..490d8762 100644
@@ -44,6 +44,7 @@ DEPENDS += "protobuf-c-native protobuf-c"
 # bind-utils is used to install dig
 # procps-ps is necessary because the ps from busybox is
 # not having the same behavior
+# iputils is used because busybox ping behaves differently
 RDEPENDS:${PN}-ptest += " \
     bash \
     bats \
@@ -51,6 +52,7 @@ RDEPENDS:${PN}-ptest += " \
     coreutils \
     dbus-daemon-proxy \
     iproute2 \
+    iputils \
     jq \
     nmap \
     procps-ps \
Signature · 11 lines
2.41.0



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8231): https://lists.yoctoproject.org/g/meta-virtualization/message/8231
Mute This Topic: https://lists.yoctoproject.org/mt/100956964/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

In message: [meta-virtualization][PATCH 2/2] netavark: skip plugins in ptest

Quoted 37 lines · on 25/08/2023 [email protected] wrote:

From: Patrick Wicki <[email protected]>

Skip the plugin tests that were introduced in 1.6.0 and lead to ptest failure.

---
 recipes-containers/netavark/files/run-ptest | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
recipes-containers/netavark/files/run-ptest +6 -1
index 41a37dce..7e017ae2 100644
@@ -1,3 +1,8 @@
 #!/bin/bash
 
-NETAVARK=/usr/libexec/podman/netavark bats ./test/
+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)
Signature · 11 lines
2.41.0



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8232): https://lists.yoctoproject.org/g/meta-virtualization/message/8232
Mute This Topic: https://lists.yoctoproject.org/mt/100956965/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
#3 lore raw

Re: [meta-virtualization][PATCH 2/2] netavark: skip plugins in ptest

In reply to [email protected]

The ptest fails as below:

# ./run-ptest
/tmp/bats-run-ELGGaA/bats.18820.src: line 5: To: command not found
1..1
not ok 1 bats-gather-tests
# (in test file test/README.md, line 5)
#   `To run the tests locally in your sandbox, you can use one of these methods:' failed with status 127

Thanks,

Quoted 40 lines · On 8/25/23 22:51, [email protected] wrote:

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

From: Patrick Wicki <[email protected]>

Skip the plugin tests that were introduced in 1.6.0 and lead to ptest failure.

---
  recipes-containers/netavark/files/run-ptest | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
recipes-containers/netavark/files/run-ptest +6 -2
index 41a37dce..7e017ae2 100644
@@ -1,3 +1,8 @@
  #!/bin/bash
 
-NETAVARK=/usr/libexec/podman/netavark bats ./test/
+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)
--

2.41.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8232): https://lists.yoctoproject.org/g/meta-virtualization/message/8232
Mute This Topic: https://lists.yoctoproject.org/mt/100956965/3618448
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-