[Devel] [PATCH RHEL10 COMMIT] selftests/net: source net_helper.sh in fcnal-test.sh

Konstantin Khorenko khorenko at virtuozzo.com
Fri Jun 19 16:00:33 MSK 2026


The commit is pushed to "branch-rh10-6.12.0-211.16.1.12.x.vz10-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git
after rh10-6.12.0-211.16.1.12.4.vz10
------>
commit 8e5f2f5045b8b94f45c8fa825e6f0dd79fc5dcb2
Author: Eva Kurchatova <eva.kurchatova at virtuozzo.com>
Date:   Tue Jun 16 12:39:47 2026 +0300

    selftests/net: source net_helper.sh in fcnal-test.sh
    
    Commit 15c068cb214d ("selftests: net: replace sleeps in fcnal-test
    with waits") replaced the 'sleep 1' calls that followed server
    spawns with wait_local_port_listen(). Upstream did this together with
    commit d9d836bfa5e6 ("selftests: net: move wait_local_port_listen to
    lib.sh") so the helper became reachable from lib.sh, which
    fcnal-test.sh already sources.
    
    Our tree backports the first commit (as 810beccc278e) but not the
    second, leaving wait_local_port_listen undefined when fcnal-test.sh
    runs and producing dozens of subtest failures of the form:
    
        ./fcnal-test.sh: line 1198: wait_local_port_listen: command not found
        TEST: Global server - ns-A loopback IP     [FAIL]
            expected rc 0; actual rc 1
    
    Pull in the function explicitly by sourcing net_helper.sh in addition
    to lib.sh.  This keeps the change minimal compared to backporting the
    full d9d836bfa5e6 (which deletes net_helper.sh and rewrites 14 other
    callers).
    
    Fixes: 810beccc278e ("ms/selftests: net: replace sleeps in fcnal-test with waits")
    Signed-off-by: Eva Kurchatova <eva.kurchatova at virtuozzo.com>
    
    https://virtuozzo.atlassian.net/browse/VSTOR-134204
    Feature: fix selftests
---
 tools/testing/selftests/net/fcnal-test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/net/fcnal-test.sh b/tools/testing/selftests/net/fcnal-test.sh
index dfd368371fb3c..a3afa0a0e8669 100755
--- a/tools/testing/selftests/net/fcnal-test.sh
+++ b/tools/testing/selftests/net/fcnal-test.sh
@@ -38,6 +38,7 @@
 # server / client nomenclature relative to ns-A
 
 source lib.sh
+source net_helper.sh
 
 PATH=$PWD:$PWD/tools/testing/selftests/net:$PATH
 


More information about the Devel mailing list