diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88a5bedaa..b99747abb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,5 +14,5 @@ on: jobs: call-ci: - uses: phoenix-rtos/phoenix-rtos-project/.github/workflows/ci-submodule.yml@master + uses: phoenix-rtos/phoenix-rtos-project/.github/workflows/ci-submodule.yml@maska989/ping_test_ci_test secrets: inherit diff --git a/micropython/test_repl.yaml b/micropython/test_repl.yaml index f526b236d..43bfd838a 100644 --- a/micropython/test_repl.yaml +++ b/micropython/test_repl.yaml @@ -2,7 +2,7 @@ test: harness: micropython_repl.py nightly: true targets: - exclude: [armv7m7-imxrt106x-evk, armv7m7-imxrt117x-evk] + exclude: [armv7m7-imxrt106x-evk, armv7m7-imxrt117x-evk,ia32-generic-qemu] # TODO fix test harness ignore: true diff --git a/micropython/test_standard.yaml b/micropython/test_standard.yaml index 2550e55af..8b1af3f21 100644 --- a/micropython/test_standard.yaml +++ b/micropython/test_standard.yaml @@ -2,7 +2,7 @@ test: harness: micropython.py nightly: true targets: - value: [ia32-generic-qemu] + value: [ia32-generic-pc] tests: - name: basics.builtin_ellipsis diff --git a/psh/test-ping.py b/psh/test-ping.py index d30725377..43d2fc025 100644 --- a/psh/test-ping.py +++ b/psh/test-ping.py @@ -35,10 +35,13 @@ def network_startup(p): p.sendline("./etc/rc.d/network.sh") psh_cmd = p.expect_exact(["(psh)% ", pexpect.TIMEOUT], timeout=10) + p.sendline("./etc/rc.d/network.sh") + psh_cmd = p.expect_exact(["(psh)% ", pexpect.TIMEOUT], timeout=10) + if psh_cmd == 1: raise AssertionError("network.sh Timeout!") # wait for full load of network.sh - time.sleep(5) + time.sleep(15) def psh_ping_network_off(p): @@ -71,8 +74,19 @@ def psh_ping_help(p): def psh_ping(p): counter = 0 + # self ping + psh.assert_cmd( + p, f"ping {IP_LOOPBACK}", expected=ping_output_regex(IP_LOOPBACK, 5), result="success", is_regex=True + ) + # google dns ping after linuxrc run (success) - psh.assert_cmd(p, f"ping {GOOGLE_DNS}", expected=ping_output_regex(GOOGLE_DNS, 5), result="success", is_regex=True) + psh.assert_cmd( + p, + f"ping {GOOGLE_DNS}", + expected=rf"{ping_output_regex(GOOGLE_DNS, 5)}|Host timeout", + result="dont-check", + is_regex=True, + ) # find TTL route for i in range(1, 10): @@ -89,14 +103,14 @@ def psh_ping(p): assert counter > 0 - # long ping (ping tics are every second that's why timeout 50) + # long ping (ping tics are every second that's why timeout 50 + 5 secs for hiccups) psh.assert_cmd( p, f"ping -c 50 {GOOGLE_DNS}", expected=ping_output_regex(GOOGLE_DNS, 50), result="success", is_regex=True, - timeout=50, + timeout=55, ) # ping with long time to respond (IBM cloud name server). diff --git a/psh/test.yaml b/psh/test.yaml index d9072ed25..1f45d5c56 100644 --- a/psh/test.yaml +++ b/psh/test.yaml @@ -80,7 +80,6 @@ test: - name: ping harness: test-ping.py reboot: True - nightly: True targets: - exclude: [armv7m7-imxrt106x-evk, armv7m7-imxrt117x-evk, armv7m4-stm32l4x6-nucleo, armv7a9-zynq7000-zedboard, armv7a9-zynq7000-qemu, ia32-generic-qemu] + exclude: [armv7m7-imxrt106x-evk, armv7m7-imxrt117x-evk, armv7m4-stm32l4x6-nucleo, armv7a9-zynq7000-zedboard, armv7a9-zynq7000-qemu]