Merge pull request #111 from Bouncheck/mvn-integration-test

Switch to running integration-test phase for 4.x versions

Author: dkropachev

main.py

@@ -89,11 +89,11 @@ def extract_n_latest_repo_tags(repo_directory: str, major_versions: List[str], l
                         nargs='?', default='')
     parser.add_argument('--versions', default=[],
                         help='java-driver versions to test')
-    parser.add_argument('--tests', default='*',
-                        help='tests to pass to nosetests tool, default=tests.integration.standard')
+    parser.add_argument('--tests', default='',
+                        help='Initial tests list to pass along. Runner will modify it according to ignore.yaml from version patch. default=\'\'')
     parser.add_argument('--scylla-version', help="relocatable scylla version to use", default=os.environ.get('SCYLLA_VERSION', None))
     parser.add_argument('--recipients', help="whom to send mail at the end of the run",  nargs='+', default=None)
-    parser.add_argument('--driver-type', help='Type of python-driver ("scylla", "cassandra" or "datastax")',
+    parser.add_argument('--driver-type', help='Type of java-driver ("scylla", "cassandra" or "datastax")',
                         dest='driver_type', default='datastax')
     parser.add_argument('--version-size', help='The number of the latest versions that will test.'
                                                'The version is filtered by the major and minor values.'

processjunit.py

@@ -21,7 +21,7 @@ def _create_report(self):
 
         new_tree = ElementTree.Element("testsuite")
         is_first_run = True
-        for file_path in self.tests_result_path.glob("*.xml"):
+        for file_path in self.tests_result_path.glob("TEST-*.xml"):
             tree = ElementTree.parse(file_path)
             testsuite_element = next(tree.iter("testsuite"))
             for key in self._summary:

run.py

@@ -25,7 +25,7 @@ def __init__(self, java_driver_git, scylla_install_dir, tag, tests, driver_type,
         self._scylla_version = scylla_version
         self._scylla_install_dir = scylla_install_dir
         self._tests = tests
-        self._report_path = self._java_driver_git / "integration-tests" / "target" / "surefire-reports"
+        self._report_path = self._java_driver_git / "integration-tests" / "target" / "failsafe-reports"
         if self._tag.startswith('3'):
             self._report_path = self._java_driver_git / "driver-core" / "target" / "surefire-reports"
         self._root_path = Path(__file__).parent
@@ -141,7 +141,7 @@ def run(self) -> ProcessJUnit:
 
         tests_string = self._tests
         if exclude_str := ','.join(f"!{ignore_element}" for ignore_element in self.ignore_tests):
-            tests_string = f"{exclude_str},{tests_string}"
+            tests_string = f"{exclude_str},{tests_string}".rstrip(',')
 
         no_tty = '' if sys.stdout.isatty() else '-B'
 
@@ -152,7 +152,12 @@ def run(self) -> ProcessJUnit:
         logging.info("Starting build the version")
         self._run_command_in_shell(f"mvn {no_tty} install -DskipTests=true -Dmaven.javadoc.skip=true -V")
 
-        cmd = f"mvn {no_tty} -pl integration-tests -Dtest='{tests_string}' test"
+
+        cmd = f"mvn {no_tty} -pl integration-tests integration-test"
+
+        if tests_string:
+            cmd += f" -Dit.test='{tests_string}'"
+
         if self._tag.startswith('3'):
             cmd = f"mvn {no_tty} -pl driver-core -Dtest.groups='short,long' -Dtest='{tests_string}' test"