diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2018-06-21 12:02:32 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2018-06-21 12:05:29 +0200 |
| commit | 3c565f72833f77247e24945af6ff82183304773c (patch) | |
| tree | b60f6a24966b045a27448b7de1cac41d92597b55 | |
| parent | 3c6bd3fd301802c155e09da16f800b797965f871 (diff) | |
tests: fix another netstat/ss issuenetstat-ss
| -rw-r--r-- | tests/main/interfaces-network-observe/task.yaml | 2 | ||||
| -rw-r--r-- | tests/main/interfaces-network/task.yaml | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/main/interfaces-network-observe/task.yaml b/tests/main/interfaces-network-observe/task.yaml index 37129ba89d..781d175a44 100644 --- a/tests/main/interfaces-network-observe/task.yaml +++ b/tests/main/interfaces-network-observe/task.yaml @@ -46,7 +46,7 @@ execute: | snap connect network-observe-consumer:network-observe echo "Then the snap command can query network status information" - network-observe-consumer | grep -P "0.0.0.0:$PORT.*?LISTEN" + network-observe-consumer | MATCH "LISTEN.*:$PORT" if [ "$(snap debug confinement)" = strict ] ; then echo "When the plug is disconnected" diff --git a/tests/main/interfaces-network/task.yaml b/tests/main/interfaces-network/task.yaml index 7d594ac2db..cc059cd700 100644 --- a/tests/main/interfaces-network/task.yaml +++ b/tests/main/interfaces-network/task.yaml @@ -27,8 +27,9 @@ prepare: | printf "#!/bin/sh -e\nwhile true; do echo \"HTTP/1.1 200 OK\n\nok\n\" | nc -l -p $PORT -q 1; done" > $SERVICE_FILE chmod a+x $SERVICE_FILE systemd_create_and_start_unit $SERVICE_NAME "$(readlink -f $SERVICE_FILE)" - - while ! ss -lnt | grep -Pq "tcp.*?:$PORT +.*?LISTEN\n*"; do sleep 0.5; done + # shellcheck source=tests/lib/network.sh + . $TESTSLIB/network.sh + wait_listen_port "$PORT" restore: | . $TESTSLIB/systemd.sh |