remove tap workaround

inverse-inc · Dec 22, 2021 · b351c1b · b351c1b
1 parent 4714333
commit b351c1b
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 39 deletions.
diff --git a/t/venom/.venomrc b/t/venom/.venomrc
@@ -2,7 +2,7 @@ variables_files:
   - vars/all.yml
   - vars/local.yml
 stop_on_failure: true
-#format: tap
+format: tap
 output_dir: results
 lib_dir: lib
 verbosity: 1
diff --git a/t/venom/scenarios/captive_portal/playbooks/run_tests.yml b/t/venom/scenarios/captive_portal/playbooks/run_tests.yml
@@ -20,11 +20,10 @@
       loop: '{{ test_suites }}'
       vars:
         venom_wrapper_args:
-          # temp, overcome two Venom issues:
-          # - tap: https://github.com/ovh/venom/issues/428
+          # temp, overcome Venom issue:
           # - when running test suite one by one, previous logs and results are overriden
           # Venom will create one directory per test suite to store results
-          VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}'
+          VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}'
 
       # add inventory__group_environment to Ansible environment
       # useful to make env vars available for Venom

diff --git a/t/venom/scenarios/configurator/playbooks/run_tests.yml b/t/venom/scenarios/configurator/playbooks/run_tests.yml
@@ -15,11 +15,10 @@
       loop: '{{ test_suites }}'
       vars:
         venom_wrapper_args:
-          # temp, overcome two Venom issues:
-          # - tap: https://github.com/ovh/venom/issues/428
+          # temp, overcome Venom issue:
           # - when running test suite one by one, previous logs and results are overriden
           # Venom will create one directory per test suite to store results
-          VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}'
+          VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}'
 
       # add inventory__group_environment to Ansible environment
       # useful to make env vars available for Venom

diff --git a/t/venom/scenarios/dot1x_eap_peap/playbooks/run_tests.yml b/t/venom/scenarios/dot1x_eap_peap/playbooks/run_tests.yml
@@ -21,11 +21,10 @@
       loop: '{{ test_suites }}'
       vars:
         venom_wrapper_args:
-          # temp, overcome two Venom issues:
-          # - tap: https://github.com/ovh/venom/issues/428
+          # temp, overcome Venom issue:
           # - when running test suite one by one, previous logs and results are overriden
           # Venom will create one directory per test suite to store results
-          VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}'
+          VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}'
 
       # add inventory__group_environment to Ansible environment
       # useful to make env vars available for Venom

diff --git a/t/venom/scenarios/dot1x_eap_tls/playbooks/run_tests.yml b/t/venom/scenarios/dot1x_eap_tls/playbooks/run_tests.yml
@@ -21,11 +21,10 @@
       loop: '{{ test_suites }}'
       vars:
         venom_wrapper_args:
-          # temp, overcome two Venom issues:
-          # - tap: https://github.com/ovh/venom/issues/428
+          # temp, overcome Venom issue:
           # - when running test suite one by one, previous logs and results are overriden
           # Venom will create one directory per test suite to store results
-          VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}'
+          VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}'
 
       # add inventory__group_environment to Ansible environment
       # useful to make env vars available for Venom

diff --git a/t/venom/scenarios/example/playbooks/run_tests.yml b/t/venom/scenarios/example/playbooks/run_tests.yml
@@ -16,11 +16,10 @@
       loop: '{{ test_suites }}'
       vars:
         venom_wrapper_args:
-          # temp, overcome two Venom issues:
-          # - tap: https://github.com/ovh/venom/issues/428
+          # temp, overcome Venom issue:
           # - when running test suite one by one, previous logs and results are overriden
           # Venom will create one directory per test suite to store results
-          VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}'
+          VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}'
 
       # add inventory__group_environment to Ansible environment
       # useful to make env vars available for Venom

diff --git a/t/venom/scenarios/export_import/playbooks/run_tests.yml b/t/venom/scenarios/export_import/playbooks/run_tests.yml
@@ -21,11 +21,10 @@
       loop: '{{ test_suites }}'
       vars:
         venom_wrapper_args:
-          # temp, overcome two Venom issues:
-          # - tap: https://github.com/ovh/venom/issues/428
+          # temp, overcome Venom issue:
           # - when running test suite one by one, previous logs and results are overriden
           # Venom will create one directory per test suite to store results
-          VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}'
+          VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}'
 
       # add inventory__group_environment to Ansible environment
       # useful to make env vars available for Venom
@@ -50,10 +49,9 @@
       vars:
         venom_wrapper_args:
           # temp, overcome two Venom issues:
-          # - tap: https://github.com/ovh/venom/issues/428
           # - when running test suite one by one, previous logs and results are overriden
           # Venom will create one directory per test suite to store results
-          VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}'
+          VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}'
 
       # add inventory__group_environment to Ansible environment
       # useful to make env vars available for Venom

diff --git a/t/venom/scenarios/fingerbank_invalid_db/playbooks/run_tests.yml b/t/venom/scenarios/fingerbank_invalid_db/playbooks/run_tests.yml
@@ -53,11 +53,10 @@
       loop: '{{ test_suites }}'
       vars:
         venom_wrapper_args:
-          # temp, overcome two Venom issues:
-          # - tap: https://github.com/ovh/venom/issues/428
+          # temp, overcome Venom issue:
           # - when running test suite one by one, previous logs and results are overriden
           # Venom will create one directory per test suite to store results
-          VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}'
+          VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}'
 
       # add inventory__group_environment to Ansible environment
       # useful to make env vars available for Venom

diff --git a/t/venom/scenarios/mac_auth/playbooks/run_tests.yml b/t/venom/scenarios/mac_auth/playbooks/run_tests.yml
@@ -21,11 +21,10 @@
       loop: '{{ test_suites }}'
       vars:
         venom_wrapper_args:
-          # temp, overcome two Venom issues:
-          # - tap: https://github.com/ovh/venom/issues/428
+          # temp, overcome Venom issue:
           # - when running test suite one by one, previous logs and results are overriden
           # Venom will create one directory per test suite to store results
-          VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}'
+          VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}'
 
       # add inventory__group_environment to Ansible environment
       # useful to make env vars available for Venom

diff --git a/t/venom/scenarios/template/playbooks/run_tests.yml b/t/venom/scenarios/template/playbooks/run_tests.yml
@@ -18,11 +18,10 @@
       loop: '{{ test_suites }}'
       vars:
         venom_wrapper_args:
-          # temp, overcome two Venom issues:
-          # - tap: https://github.com/ovh/venom/issues/428
+          # temp, overcome Venom issue:
           # - when running test suite one by one, previous logs and results are overriden
           # Venom will create one directory per test suite to store results
-          VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}'
+          VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}'
 
       # add inventory__group_environment to Ansible environment
       # useful to make env vars available for Venom

diff --git a/t/venom/scenarios/test_venom/playbooks/run_tests.yml b/t/venom/scenarios/test_venom/playbooks/run_tests.yml
@@ -16,11 +16,10 @@
       loop: '{{ test_suites }}'
       vars:
         venom_wrapper_args:
-          # temp, overcome two Venom issues:
-          # - tap: https://github.com/ovh/venom/issues/428
+          # temp, overcome Venom issue:
           # - when running test suite one by one, previous logs and results are overriden
           # Venom will create one directory per test suite to store results
-          VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}'
+          VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}'
 
       # add inventory__group_environment to Ansible environment
       # useful to make env vars available for Venom

diff --git a/t/venom/scenarios/unit_tests/playbooks/run_tests.yml b/t/venom/scenarios/unit_tests/playbooks/run_tests.yml
@@ -28,11 +28,10 @@
       loop: '{{ test_suites }}'
       vars:
         venom_wrapper_args:
-          # temp, overcome two Venom issues:
-          # - tap: https://github.com/ovh/venom/issues/428
+          # temp, overcome Venom issue:
           # - when running test suite one by one, previous logs and results are overriden
           # Venom will create one directory per test suite to store results
-          VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}'
+          VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}'
 
       # add inventory__group_environment to Ansible environment
       # useful to make env vars available for Venom

diff --git a/t/venom/test_suites/captive_portal/locales/00_check_locales_on_portal.yml b/t/venom/test_suites/captive_portal/locales/00_check_locales_on_portal.yml
@@ -7,5 +7,5 @@ testcases:
         user: '{{.ssh_user}}'
         command: |
           cd /usr/local/pf/t/venom ; \
-          sudo VENOM_COMMON_FLAGS='--format=tap --var configurator.interfaces.reg.ip={{.configurator.interfaces.reg.ip}}' \
+          sudo VENOM_COMMON_FLAGS='--var configurator.interfaces.reg.ip={{.configurator.interfaces.reg.ip}}' \
           /usr/local/pf/t/venom/venom-wrapper.sh {{.nodes_test_suite_dir}}/captive_portal/{{.venom.testcase}}.yml
diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_scep/75_run_sscep_on_node01.yml b/t/venom/test_suites/wired_dot1x_eap_tls_scep/75_run_sscep_on_node01.yml
@@ -7,4 +7,4 @@ testcases:
         user: '{{.ssh_user}}'
         command:  |
           cd /usr/local/pf/t/venom ; \
-          sudo VENOM_COMMON_FLAGS='--format=tap --var pfserver_mgmt_ip={{.pfserver_mgmt_ip}}' /usr/local/pf/t/venom/venom-wrapper.sh {{.nodes_test_suite_dir}}/wired_dot1x_eap_tls/{{.venom.testcase}}.yml
+          sudo VENOM_COMMON_FLAGS='--var pfserver_mgmt_ip={{.pfserver_mgmt_ip}}' /usr/local/pf/t/venom/venom-wrapper.sh {{.nodes_test_suite_dir}}/wired_dot1x_eap_tls/{{.venom.testcase}}.yml
diff --git a/t/venom/venom-wrapper.sh b/t/venom/venom-wrapper.sh
@@ -27,7 +27,7 @@ configure_and_check() {
     VENOM_ROOT_DIR=$(readlink -e $(dirname ${BASH_SOURCE[0]}))
     VENOM_BINARY="${VENOM_BINARY:-`which venom`}"
     # temp, overcome tap issue: https://github.com/ovh/venom/issues/428
-    VENOM_COMMON_FLAGS="${VENOM_COMMON_FLAGS:---format=tap}"
+    VENOM_COMMON_FLAGS="${VENOM_COMMON_FLAGS:-}"
     VENOM_EXIT_FLAGS="${VENOM_EXIT_FLAGS:-}"
 
     echo -e "Using venom using following variables:"