From 726f18f1944f5658ccb021454b31d2394d31d6c1 Mon Sep 17 00:00:00 2001 From: N-Nagorny Date: Wed, 6 Mar 2024 21:07:22 +0400 Subject: [PATCH] Temporarily disable IS-11 tests --- .github/workflows/build-test.yml | 6 ++---- .github/workflows/src/amwa-test.yml | 3 +-- Sandbox/run_nmos_testing.sh | 6 +++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index c7f43803..e6704fbf 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -388,10 +388,9 @@ jobs: set -x root_dir=`pwd` - # Install AMWA NMOS Testing Tool (is-11 instead of master until IS-11 tests are merged) + # Install AMWA NMOS Testing Tool git clone https://github.com/AMWA-TV/nmos-testing.git cd nmos-testing - git checkout is-11 # Configure the Testing Tool so all APIs are tested with TLS and authorization printf "from . import Config as CONFIG\nCONFIG.ENABLE_HTTPS = True\nCONFIG.MOCK_SERVICES_WARM_UP_DELAY = 30\nCONFIG.HTTP_TIMEOUT = 2\n" > nmostesting/UserConfig.py @@ -945,10 +944,9 @@ jobs: set -x root_dir=`pwd` - # Install AMWA NMOS Testing Tool (is-11 instead of master until IS-11 tests are merged) + # Install AMWA NMOS Testing Tool git clone https://github.com/AMWA-TV/nmos-testing.git cd nmos-testing - git checkout is-11 # Configure the Testing Tool so all APIs are tested with TLS and authorization printf "from . import Config as CONFIG\nCONFIG.ENABLE_HTTPS = True\nCONFIG.MOCK_SERVICES_WARM_UP_DELAY = 30\nCONFIG.HTTP_TIMEOUT = 2\n" > nmostesting/UserConfig.py diff --git a/.github/workflows/src/amwa-test.yml b/.github/workflows/src/amwa-test.yml index 620489ca..663c0b33 100644 --- a/.github/workflows/src/amwa-test.yml +++ b/.github/workflows/src/amwa-test.yml @@ -15,10 +15,9 @@ set -x root_dir=`pwd` - # Install AMWA NMOS Testing Tool (is-11 instead of master until IS-11 tests are merged) + # Install AMWA NMOS Testing Tool git clone https://github.com/AMWA-TV/nmos-testing.git cd nmos-testing - git checkout is-11 # Configure the Testing Tool so all APIs are tested with TLS and authorization printf "from . import Config as CONFIG\nCONFIG.ENABLE_HTTPS = True\nCONFIG.MOCK_SERVICES_WARM_UP_DELAY = 30\nCONFIG.HTTP_TIMEOUT = 2\n" > nmostesting/UserConfig.py diff --git a/Sandbox/run_nmos_testing.sh b/Sandbox/run_nmos_testing.sh index 4c6de7b3..ec661b54 100755 --- a/Sandbox/run_nmos_testing.sh +++ b/Sandbox/run_nmos_testing.sh @@ -36,7 +36,7 @@ expected_disabled_IS_08_02=0 expected_disabled_IS_09_02=0 expected_disabled_IS_04_02=0 expected_disabled_IS_09_01=0 -expected_disabled_IS_11_01=0 +# expected_disabled_IS_11_01=0 config_secure=`${run_python} -c $'from nmostesting import Config\nprint(Config.ENABLE_HTTPS)'` || (echo "error running python"; exit 1) config_dns_sd_mode=`${run_python} -c $'from nmostesting import Config\nprint(Config.DNS_SD_MODE)'` || (echo "error running python"; exit 1) @@ -142,7 +142,7 @@ else (( expected_disabled_IS_08_01+=7 )) (( expected_disabled_IS_08_02+=14 )) # test_04_03, test_04_03_01, test_04_03_01_01, test_04_03_02, test_04_03_02_01 - (( expected_disabled_IS_11_01+=26 )) + # (( expected_disabled_IS_11_01+=26 )) # test_33, test_33_1 (( expected_disabled_IS_04_02+=16 )) (( expected_disabled_IS_09_01+=7 )) @@ -215,7 +215,7 @@ do_run_test IS-08-02 $expected_disabled_IS_08_02 --host "${host}" "${host}" --po do_run_test IS-09-02 $expected_disabled_IS_09_02 --host "${host}" null --port 0 0 --version null v1.0 -do_run_test IS-11-01 $expected_disabled_IS_11_01 --host "${host}" "${host}" "${host}" --port 1080 1080 1080 --version v1.0 v1.3 v1.1 +# do_run_test IS-11-01 $expected_disabled_IS_11_01 --host "${host}" "${host}" "${host}" --port 1080 1080 1080 --version v1.0 v1.3 v1.1 # Run Registry tests (leave Node running) "${registry_command}" "{\"pri\":0,\"http_port\":8088 ${common_params} ${registry_params}}" > ${results_dir}/registryoutput 2>&1 &