integration-tests: allow inclusive and exclusive options together (#265)

erigontech · Oct 24, 2024 · 48556b0 · 48556b0
1 parent 17b9780
commit 48556b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/integration/README.md b/integration/README.md
@@ -51,7 +51,7 @@ Launch an automated test sequence on Silkworm RpcDaemon (aka Silkrpc) or Erigon
 -s,--start-from-test: <test_number>: run tests starting from input
 -t,--run-single-test: <test_number>: run single test
 -d,--compare-erigon-rpcdaemon: send requests also to the reference daemon e.g.: Erigon RpcDaemon
--T,--transport_type: <http,http_comp,websocket,websocket_comp>
+-T,--transport_type: <http,http_comp,https,websocket,websocket_comp>
 -k,--jwt: authentication token file
 -a,--api-list-with: <apis>: run all tests of the specified API that contains string (e.g.: eth_,debug_)
 -A,--api-list: <apis>: run all tests of the specified API that match full name (e.g.: eth_call,eth_getLogs)

diff --git a/integration/run_tests.py b/integration/run_tests.py
@@ -365,11 +365,6 @@ def select_user_options(self, argv):
                 elif option in ("-s", "--start-from-test"):
                     self.start_test = int(optarg)
                 elif option in ("-a", "--api-list-with"):
-                    if self.exclude_api_list != "":
-                        print("Error on options: "
-                              "-a/--api-list-with is not compatible with -X/--exclude-test-list")
-                        usage(argv)
-                        sys.exit(1)
                     self.testing_apis_with = optarg
                 elif option in ("-A", "--api-list"):
                     if self.exclude_api_list != "":
@@ -413,11 +408,6 @@ def select_user_options(self, argv):
                     self.json_dir = "./" + self.net + "/"
                     self.output_dir = self.json_dir + self.results_dir + "/"
                 elif option in ("-x", "--exclude-api-list"):
-                    if self.req_test_number != -1 or self.testing_apis != "" or self.testing_apis_with != "":
-                        print("Error in options: "
-                              "-x/--exclude-api-list is not compatible with -a/--api-list-with or -A/--apis-list or -t/--run-single-test")
-                        usage(argv)
-                        sys.exit(1)
                     self.exclude_api_list = optarg
                 elif option in ("-X", "--exclude-test-list"):
                     if self.req_test_number != -1:
@@ -831,7 +821,7 @@ def main(argv) -> int:
                                 if config.display_only_fail == 0 and config.req_test_number != "":
                                     file = json_test_full_name.ljust(60)
                                     print(f"{test_number_in_any_loop:04d}. {file} Skipped")
-                                    tests_not_executed = tests_not_executed + 1
+                                tests_not_executed = tests_not_executed + 1
                         else:
                             # runs all tests or
                             # runs single global test