testit-cli 2.1.0__tar.gz → 2.1.2__tar.gz

{testit_cli-2.1.0 → testit_cli-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: testit-cli
-Version: 2.1.0
+Version: 2.1.2
 Summary: This tool is the command line wrapper of Test IT allowing you to upload the test results in real time to Test IT
 Home-page: https://pypi.org/project/testit-cli/
 Author: Integration team
@@ -16,10 +16,19 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: testit-api-client==4.2.0
+Requires-Dist: testit-api-client==5.0.0
 Requires-Dist: validators
 Requires-Dist: tqdm
 Requires-Dist: click~=8.0.4
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 # Test IT CLI
 

{testit_cli-2.1.0 → testit_cli-2.1.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='testit-cli',
-    version='2.1.0',
+    version='2.1.2',
     description='This tool is the command line wrapper of Test IT allowing you to upload the test results in real time '
                 'to Test IT',
     long_description=open('README.md', "r").read(),
@@ -24,7 +24,7 @@ setup(
     py_modules=['testit_cli'],
     packages=find_packages(where='src'),
     package_dir={'': 'src'},
-    install_requires=['testit-api-client==4.2.0', 'validators', 'tqdm', 'click~=8.0.4'],
+    install_requires=['testit-api-client==5.0.0', 'validators', 'tqdm', 'click~=8.0.4'],
     entry_points={
         'console_scripts': [
             'testit = testit_cli.__main__:console_main'

{testit_cli-2.1.0 → testit_cli-2.1.2}/src/testit_cli/apiclient.py

@@ -5,7 +5,7 @@ import typing
 
 from testit_api_client import ApiClient as TmsClient
 from testit_api_client import Configuration
-from testit_api_client.apis import AttachmentsApi, AutoTestsApi, TestRunsApi
+from testit_api_client.api import AttachmentsApi, AutoTestsApi, TestRunsApi, TestResultsApi
 from testit_api_client.models import AttachmentPutModel, TestRunV2PostShortModel
 
 from .converter import Converter
@@ -28,6 +28,7 @@ class ApiClient:
         self.__test_run_api = TestRunsApi(api_client=client)
         self.__autotest_api = AutoTestsApi(api_client=client)
         self.__attachments_api = AttachmentsApi(api_client=client)
+        self.__test_results_api = TestResultsApi(api_client=client)
 
     def create_test_run(self, project_id: str, name: str) -> TestRun:
         """Function creates test run and returns test run id."""
@@ -36,7 +37,7 @@ class ApiClient:
 
         test_run = self.__test_run_api.create_empty(test_run_v2_post_short_model=model)
 
-        logging.info(f'Created new testrun (ID: {test_run["id"]})')
+        logging.info(f'Created new testrun (ID: {test_run.id})')
         logging.debug(f"Test run created: {test_run}")
 
         return Converter.test_run_v2_get_model_to_test_run(test_run)
@@ -46,10 +47,9 @@ class ApiClient:
         model = Converter.test_run_to_update_empty_request(test_run)
         logging.debug(f"Updating test run with model: {model}")
 
-        response = self.__test_run_api.update_empty(test_run_v2_put_model=model)
+        self.__test_run_api.update_empty(test_run_v2_put_model=model)
 
         logging.info(f'Updated testrun (ID: {test_run.id})')
-        logging.debug(f"Test run updated: {response}")
 
     def complete_test_run(self, test_run_id: str):
         """Function completes test run."""
@@ -72,15 +72,15 @@ class ApiClient:
 
         logging.error(f"Test run {test_run_id} not found!")
 
-    def get_autotest(self, model: Converter.project_id_and_external_id_to_autotests_search_post_request):
-        """Function returns autotest."""
-        logging.debug(f"Getting autotest {model}")
+    def get_autotests(self, model: Converter.project_id_and_external_id_to_autotests_search_post_request):
+        """Function returns list of AutoTestModel."""
+        logging.debug(f"Getting autotests: {model}")
 
-        autotest = self.__autotest_api.api_v2_auto_tests_search_post(api_v2_auto_tests_search_post_request=model)
+        autotests = self.__autotest_api.api_v2_auto_tests_search_post(autotests_select_model=model)
 
-        logging.debug(f"Got autotest {autotest}")
+        logging.debug(f"Got autotests: {autotests}")
 
-        return autotest
+        return autotests
 
     def create_autotest(self, model: Converter.test_result_to_create_autotest_request):
         """Function creates autotest and returns autotest id."""
@@ -90,7 +90,7 @@ class ApiClient:
 
         logging.debug(f"Created autotest {response}")
 
-        return response["id"]
+        return response.id
 
     def update_autotest(self, model: Converter.test_result_to_update_autotest_request):
         """Function updates autotest"""
@@ -128,7 +128,7 @@ class ApiClient:
                 try:
                     attachment_response = self.__attachments_api.api_v2_attachments_post(file=open(attachment, "rb"))
 
-                    attachment_ids.append(AttachmentPutModel(attachment_response['id']))
+                    attachment_ids.append(AttachmentPutModel(id=attachment_response.id))
 
                     logging.debug(f'Attachment "{attachment}" was uploaded')
                 except Exception as exc:
@@ -137,3 +137,16 @@ class ApiClient:
                 logging.error(f'File "{attachment}" was not found!')
 
         return attachment_ids
+
+    def get_test_results(
+            self,
+            model: Converter.testrun_id_and_configuration_id_and_in_progress_outcome_to_test_results_search_post_request):
+        """Function returns list of TestResultShortGetModel."""
+        logging.debug(f"Getting test results: {model}")
+
+        test_results = self.__test_results_api.api_v2_test_results_search_post(
+            test_results_filter_request=model)
+
+        logging.debug(f"Got test results: {test_results}")
+
+        return test_results

testit_cli-2.1.2/src/testit_cli/autotests_filter.py

@@ -0,0 +1,29 @@
+import hashlib
+
+from .apiclient import ApiClient
+from .converter import Converter
+from .filter_factory import FilterFactory
+from .models.config import Config
+
+
+class AutotestsFilter:
+    def __init__(self, api_client: ApiClient, config: Config):
+        self.__api_client = api_client
+        self.__config = config
+
+    def create_filter(self):
+        """Function returns str of filter by autotests for test Framework run command."""
+        test_results_search_post_model = Converter.testrun_id_and_configuration_id_and_in_progress_outcome_to_test_results_search_post_request(
+            self.__config.testrun_id,
+            self.__config.configuration_id)
+        test_results = self.__api_client.get_test_results(test_results_search_post_model)
+        autotest_ids = Converter.test_result_short_get_models_to_autotest_ids(test_results)
+        autotests_search_post_model = Converter.autotest_ids_to_autotests_search_post_request(autotest_ids)
+        autotests = self.__api_client.get_autotests(autotests_search_post_model)
+        external_keys = Converter.autotest_models_to_external_keys(autotests)
+
+        return FilterFactory.get(self.__config, external_keys)
+
+    @staticmethod
+    def __get_external_id(value: str):
+        return hashlib.md5(value.encode("utf-8")).hexdigest()

{testit_cli-2.1.0 → testit_cli-2.1.2}/src/testit_cli/click_commands.py

@@ -75,7 +75,7 @@ class ExtraArgsForOption(click.Option):
 @click.option("-dcv", "--disable-cert-validation", is_flag=True, help="Disables certificate validation")
 def upload_results(url, token, configuration_id, testrun_id, separator, namespace, classname, results, debug, attachments, disable_cert_validation):
     """Uploading results from different streams"""
-    config = Config(url, token, "", configuration_id, testrun_id, "", separator, namespace, classname, list(chain.from_iterable(results)), debug, "", list(chain.from_iterable(attachments)), disable_cert_validation)
+    config = Config(url, token, "", configuration_id, testrun_id, "", separator, namespace, classname, list(chain.from_iterable(results)), debug, "", list(chain.from_iterable(attachments)), disable_cert_validation, "")
     service = ServiceFactory().get(config)
 
     service.upload_results()
@@ -100,7 +100,7 @@ def import_results(url, token, project_id, configuration_id, testrun_id, testrun
     if testrun_id is not None and testrun_name is not None:
         click.echo("Illegal usage: `{}` are mutually exclusive arguments.".format(', '.join(["--testrun-id", "--testrun-name"])), err=True)
 
-    config = Config(url, token, project_id, configuration_id, testrun_id, testrun_name, separator, namespace, classname, list(chain.from_iterable(results)), debug, "", list(chain.from_iterable(attachments)), disable_cert_validation)
+    config = Config(url, token, project_id, configuration_id, testrun_id, testrun_name, separator, namespace, classname, list(chain.from_iterable(results)), debug, "", list(chain.from_iterable(attachments)), disable_cert_validation, "")
     service = ServiceFactory().get(config)
 
     service.import_results()
@@ -123,7 +123,7 @@ def testrun():
 @click.option("-dcv", "--disable-cert-validation", is_flag=True, help="Disables certificate validation")
 def create_test_run(url, token, project_id, testrun_name, output, debug, attachments, disable_cert_validation):
     """Creating a new test run"""
-    config = Config(url, token, project_id, "", "", testrun_name, "", "", "", [], debug, output, list(chain.from_iterable(attachments)), disable_cert_validation)
+    config = Config(url, token, project_id, "", "", testrun_name, "", "", "", [], debug, output, list(chain.from_iterable(attachments)), disable_cert_validation, "")
     service = ServiceFactory().get(config)
 
     service.create_test_run()
@@ -138,7 +138,7 @@ def create_test_run(url, token, project_id, testrun_name, output, debug, attachm
 @click.option("-dcv", "--disable-cert-validation", is_flag=True, help="Disables certificate validation")
 def complete_test_run(url, token, testrun_id, debug, attachments, disable_cert_validation):
     """Completing the test run"""
-    config = Config(url, token, "", "", testrun_id, "", "", "", "", [], debug, "", list(chain.from_iterable(attachments)), disable_cert_validation)
+    config = Config(url, token, "", "", testrun_id, "", "", "", "", [], debug, "", list(chain.from_iterable(attachments)), disable_cert_validation, "")
     service = ServiceFactory().get(config)
 
     service.finished_test_run()
@@ -153,7 +153,31 @@ def complete_test_run(url, token, testrun_id, debug, attachments, disable_cert_v
 @click.option("-dcv", "--disable-cert-validation", is_flag=True, help="Disables certificate validation")
 def upload_attachments_for_test_run(url, token, testrun_id, debug, attachments, disable_cert_validation):
     """Uploading attachments for the test run"""
-    config = Config(url, token, "", "", testrun_id, "", "", "", "", [], debug, "", list(chain.from_iterable(attachments)), disable_cert_validation)
+    config = Config(url, token, "", "", testrun_id, "", "", "", "", [], debug, "", list(chain.from_iterable(attachments)), disable_cert_validation, "")
     service = ServiceFactory().get(config)
 
     service.upload_attachments_for_test_run()
+
+
+PYTHON_FRAMEWORKS = ['pytest', 'robotframework', 'behave', 'nose']
+JAVA_FRAMEWORKS = ['gradle-testng', 'gradle-junit5', 'gradle-junit4', 'gradle-cucumber', 'maven-testng', 'maven-junit5', 'maven-junit4', 'maven-cucumber']
+JAVASCRIPT_FRAMEWORKS = ['cucumberjs', 'codeceptjs', 'jest', 'mocha', 'playwright', 'testcafe']
+DOTNET_FRAMEWORKS = ['mstest', 'nunit', 'xunit', 'specflow']
+GOLANG_FRAMEWORKS = ['golang']
+
+
+@execute.command("autotests_filter")
+@click.option("-u", "--url", type=str, envvar='TMS_URL', required=True, help="Set url address of the Test IT instance (https://demo.testit.software)", callback=validate_url)
+@click.option("-t", "--token", type=str, envvar='TMS_TOKEN', required=True, help="Set API token (T2lKd2pLZGI4WHRhaVZUejNl)")
+@click.option("-ci", "--configuration-id", type=str, envvar='TMS_CONFIGURATION_ID', required=True, help="Set configuration id (15dbb164-c1aa-4cbf-830c-8c01ae14f4fb)", callback=validate_uuid)
+@click.option("-ti", "--testrun-id", type=str, envvar='TMS_TEST_RUN_ID', required=True, help="Set test run id (3802f329-190c-4617-8bb0-2c3696abeb8f)", callback=validate_uuid)
+@click.option("-f", "--framework", type=click.Choice(PYTHON_FRAMEWORKS + JAVA_FRAMEWORKS + JAVASCRIPT_FRAMEWORKS + DOTNET_FRAMEWORKS + GOLANG_FRAMEWORKS), required=True, help="Set test framework")
+@click.option("-d", "--debug", is_flag=True, help="Set debug logs")
+@click.option("-o", "--output", type=str, required=True, help="Set file path for output (FILE)")
+@click.option("-dcv", "--disable-cert-validation", is_flag=True, help="Disables certificate validation")
+def create_filter_for_framework(url, token, configuration_id, testrun_id, framework, debug, output, disable_cert_validation):
+    """Creating filter by autotests for test frameworks"""
+    config = Config(url, token, "", configuration_id, testrun_id, "", "", "", "", [], debug, output, [], disable_cert_validation, framework)
+    service = ServiceFactory().get(config)
+
+    service.create_filter_for_test_framework()

{testit_cli-2.1.0 → testit_cli-2.1.2}/src/testit_cli/converter.py

@@ -1,10 +1,10 @@
 import typing
 
 from testit_api_client.models import (
-    AutotestsSelectModelFilter,
-    AutotestsSelectModelIncludes,
+    AutotestFilterModel,
+    SearchAutoTestsQueryIncludesModel,
     AutoTestResultsForTestRunModel,
-    ApiV2AutoTestsSearchPostRequest,
+    AutotestsSelectModel,
     AttachmentModel,
     AttachmentPutModel,
     AutoTestPostModel,
@@ -12,7 +12,11 @@ from testit_api_client.models import (
     LinkModel,
     LinkPutModel,
     TestRunV2GetModel,
-    TestRunV2PutModel
+    TestRunV2PutModel,
+    TestResultsFilterRequest,
+    TestResultOutcome,
+    TestResultShortResponse,
+    AutoTestModel
 )
 
 from .models.testrun import TestRun
@@ -21,16 +25,59 @@ from .models.testrun import TestRun
 class Converter:
     @staticmethod
     def project_id_and_external_id_to_autotests_search_post_request(project_id: str, external_id: str):
-        autotests_filter = AutotestsSelectModelFilter(
+        autotests_filter = AutotestFilterModel(
             project_ids=[project_id],
             external_ids=[external_id],
             is_deleted=False)
-        autotests_includes = AutotestsSelectModelIncludes(
+        autotests_includes = SearchAutoTestsQueryIncludesModel(
             include_steps=False,
             include_links=False,
             include_labels=False)
 
-        return ApiV2AutoTestsSearchPostRequest(filter=autotests_filter, includes=autotests_includes)
+        return AutotestsSelectModel(filter=autotests_filter, includes=autotests_includes)
+
+    @staticmethod
+    def autotest_ids_to_autotests_search_post_request(autotest_ids: typing.List[int]):
+        autotests_filter = AutotestFilterModel(
+            global_ids=autotest_ids)
+        autotests_includes = SearchAutoTestsQueryIncludesModel(
+            include_steps=False,
+            include_links=False,
+            include_labels=False)
+
+        return AutotestsSelectModel(filter=autotests_filter, includes=autotests_includes)
+
+    @staticmethod
+    def testrun_id_and_configuration_id_and_in_progress_outcome_to_test_results_search_post_request(
+            testrun_id: str,
+            configuration_id: str):
+        return TestResultsFilterRequest(
+            test_run_ids=[testrun_id],
+            configuration_ids=[configuration_id],
+            outcomes=[TestResultOutcome("InProgress")])
+
+    @staticmethod
+    def test_result_short_get_models_to_autotest_ids(test_results: typing.List[TestResultShortResponse]):
+        autotest_ids = []
+
+        for test_result in test_results:
+            autotest_ids.append(test_result.autotest_global_id)
+
+        return autotest_ids
+
+    @staticmethod
+    def autotest_models_to_external_keys(autotests: typing.List[AutoTestModel]):
+        external_keys = []
+
+        for autotest in autotests:
+            external_key = autotest.external_key
+
+            if external_key is None:
+                continue
+
+            external_keys.append(external_key)
+
+        return external_keys
 
     @staticmethod
     def test_result_to_create_autotest_request(result, external_id: str, project_id: str):
@@ -58,9 +105,9 @@ class Converter:
         result, external_id: str, configuration_id: str
     ):
         return AutoTestResultsForTestRunModel(
-            configuration_id,
-            external_id,
-            result.get_status(),
+            configuration_id=configuration_id,
+            auto_test_external_id=external_id,
+            outcome=result.get_status(),
             traces=result.get_trace(),
             duration=round(result.get_duration()),
             message=result.get_message(),
@@ -69,14 +116,14 @@ class Converter:
     @classmethod
     def test_run_v2_get_model_to_test_run(cls, test_run_model: TestRunV2GetModel) -> TestRun:
         return TestRun(
-            id=test_run_model["id"],
-            project_id=test_run_model["project_id"],
-            state=test_run_model["state_name"].value,
-            name=test_run_model["name"],
-            description=test_run_model["description"],
-            launch_source=test_run_model["launch_source"],
-            attachments=cls.attachment_models_to_attachment_put_models(test_run_model["attachments"]),
-            links=cls.link_models_to_link_put_models(test_run_model["links"])
+            id=test_run_model.id,
+            project_id=test_run_model.project_id,
+            state=test_run_model.state_name.value,
+            name=test_run_model.name,
+            description=test_run_model.description,
+            launch_source=test_run_model.launch_source,
+            attachments=cls.attachment_models_to_attachment_put_models(test_run_model.attachments),
+            links=cls.link_models_to_link_put_models(test_run_model.links)
         )
 
     @classmethod

testit_cli-2.1.2/src/testit_cli/filter_factory.py

@@ -0,0 +1,121 @@
+import typing
+
+from .models.config import Config
+
+
+class FilterFactory:
+    @classmethod
+    def get(cls, config: Config, external_keys: typing.List[str]) -> str:
+        initialization = {
+            'pytest': cls.__initialize_pytest_filter,
+            'robotframework': cls.__initialize_robotframework_filter,
+            'behave': cls.__initialize_behave_filter,
+            'nose': cls.__initialize_nose_filter,
+            'gradle-testng': cls.__initialize_gradle_testng_junit4_junit5_filter,
+            'gradle-junit4': cls.__initialize_gradle_testng_junit4_junit5_filter,
+            'gradle-junit5': cls.__initialize_gradle_testng_junit4_junit5_filter,
+            # 'gradle-jbehave': cls.__initialize_jbehave_filter,
+            'gradle-cucumber': cls.__initialize_cucumber_cucumberjs_jest_golang_filter,
+            'maven-testng': cls.__initialize_maven_testng_junit4_junit5_filter,
+            'maven-junit4': cls.__initialize_maven_testng_junit4_junit5_filter,
+            'maven-junit5': cls.__initialize_maven_testng_junit4_junit5_filter,
+            # 'maven-jbehave': cls.__initialize_jbehave_filter,
+            'maven-cucumber': cls.__initialize_cucumber_cucumberjs_jest_golang_filter,
+            'cucumberjs': cls.__initialize_cucumber_cucumberjs_jest_golang_filter,
+            'codeceptjs': cls.__initialize_codeceptjs_mocha_playwright_filter,
+            'jest': cls.__initialize_cucumber_cucumberjs_jest_golang_filter,
+            'mocha': cls.__initialize_codeceptjs_mocha_playwright_filter,
+            'playwright': cls.__initialize_codeceptjs_mocha_playwright_filter,
+            'mstest': cls.__initialize_mstest_nunit_xunit_filter,
+            'nunit': cls.__initialize_mstest_nunit_xunit_filter,
+            'xunit': cls.__initialize_mstest_nunit_xunit_filter,
+            'specflow': cls.__initialize_specflow_filter,
+            'golang': cls.__initialize_cucumber_cucumberjs_jest_golang_filter,
+        }
+
+        return initialization[config.framework](external_keys)
+
+    @classmethod
+    def __initialize_pytest_filter(cls, external_keys: typing.List[str]):
+        """Initialize filter for pytest run"""
+        return '-k\n' + ' or '.join(external_keys)
+
+    @staticmethod
+    def __initialize_robotframework_filter(external_keys: typing.List[str]):
+        """Initialize filter for RobotFramework run"""
+        robotframework_filter = ""
+
+        for external_key in external_keys:
+            robotframework_filter += '-t' + external_key.replace(" ", "") + '\n'
+
+        return robotframework_filter
+
+    @staticmethod
+    def __initialize_behave_filter(external_keys: typing.List[str]):
+        """Initialize filter for Behave run"""
+        return '-n' + '|'.join(external_keys)
+
+    @classmethod
+    def __initialize_nose_filter(cls, external_keys: typing.List[str]):
+        """Initialize filter for Nose run"""
+        return ' '.join(external_keys)
+
+    @staticmethod
+    def __initialize_gradle_testng_junit4_junit5_filter(external_keys: typing.List[str]):
+        """Initialize filter for gradle TestNG or JUnit4 or JUnit5 run with gradle"""
+        autotest_keys = []
+
+        for external_key in external_keys:
+            autotest_keys.append('--tests ' + external_key)
+
+        return ' '.join(autotest_keys)
+
+    # @classmethod
+    # def __initialize_jbehave_filter(cls, external_keys: typing.List[str]):
+    #     """Initialize filter for JBehave run"""
+    #     return '+' + ' '.join(external_keys)
+
+    @staticmethod
+    def __initialize_maven_testng_junit4_junit5_filter(external_keys: typing.List[str]):
+        """Initialize filter for TestNG or JUnit4 or JUnit5 run with maven"""
+        autotest_keys = []
+
+        for external_key in external_keys:
+            autotest_keys.append('-Dtest=' + external_key)
+
+        return ' '.join(autotest_keys)
+
+    @classmethod
+    def __initialize_codeceptjs_mocha_playwright_filter(cls, external_keys: typing.List[str]):
+        """Initialize filter for CodeceptJS or Mocha or Playwright run"""
+        return '|'.join(external_keys)
+
+    @classmethod
+    def __initialize_cucumber_cucumberjs_jest_golang_filter(cls, external_keys: typing.List[str]):
+        """Initialize filter for Cucumber or CucumberJS or Jest or Golang run"""
+        autotest_keys = []
+
+        for external_key in external_keys:
+            autotest_keys.append('^' + external_key + '$')
+
+        return '|'.join(autotest_keys)
+
+    @staticmethod
+    def __initialize_mstest_nunit_xunit_filter(external_keys: typing.List[str]):
+        """Initialize filter for MSTest or NUnit or XUnit run"""
+        autotest_keys = []
+
+        for external_key in external_keys:
+            autotest_keys.append('FullyQualifiedName=' + external_key)
+
+        return '|'.join(autotest_keys)
+
+    @staticmethod
+    def __initialize_specflow_filter(external_keys: typing.List[str]):
+        """Initialize filter for SpecFlow run"""
+        autotest_keys = []
+
+        for external_key in external_keys:
+            autotest_keys.append('FullyQualifiedName~' + external_key)
+
+        return '|'.join(autotest_keys)

{testit_cli-2.1.0 → testit_cli-2.1.2}/src/testit_cli/importer.py

@@ -21,20 +21,20 @@ class Importer:
                 + result.get_name()
             )
 
-            autotest = self.__api_client.get_autotest(
+            autotests = self.__api_client.get_autotests(
                 Converter.project_id_and_external_id_to_autotests_search_post_request(
                     self.__config.project_id, external_id
                 )
             )
 
-            if not autotest:
+            if not autotests:
                 self.__api_client.create_autotest(
                     Converter.test_result_to_create_autotest_request(
                         result, external_id, self.__config.project_id
                     )
                 )
             else:
-                result.set_is_flaky(autotest[0]['is_flaky'])
+                result.set_is_flaky(autotests[0]['is_flaky'])
 
                 self.__api_client.update_autotest(
                     Converter.test_result_to_update_autotest_request(

{testit_cli-2.1.0 → testit_cli-2.1.2}/src/testit_cli/models/config.py

@@ -17,3 +17,4 @@ class Config:
     output: str
     paths_to_attachments: list
     disable_cert_validation: bool
+    framework: str

{testit_cli-2.1.0 → testit_cli-2.1.2}/src/testit_cli/models/testcase.py

@@ -1,6 +1,6 @@
 from datetime import timedelta
 
-from testit_api_client.model.available_test_result_outcome import AvailableTestResultOutcome
+from testit_api_client.models import AvailableTestResultOutcome
 
 from .status import Status
 

{testit_cli-2.1.0 → testit_cli-2.1.2}/src/testit_cli/service.py

@@ -1,5 +1,6 @@
 import logging
 
+from .autotests_filter import AutotestsFilter
 from .models.config import Config
 from .models.testrun import TestRun
 from .parser import Parser
@@ -16,11 +17,13 @@ class Service:
         api_client: ApiClient,
         parser: Parser,
         importer: Importer,
+        autotests_filter: AutotestsFilter
     ):
         self.__config = config
         self.__api_client = api_client
         self.__parser = parser
         self.__importer = importer
+        self.__autotests_filter = autotests_filter
 
     def import_results(self):
         self.__upload_results()
@@ -33,10 +36,7 @@ class Service:
         test_run = self.__create_test_run()
         self.__update_test_run_with_attachments(test_run)
 
-        DirWorker.create_dir(self.__config.output)
-
-        with open(self.__config.output, "w") as text_file:
-            text_file.write(test_run.id)
+        self.__write_to_output(test_run.id)
 
     def finished_test_run(self):
         test_run = self.__api_client.get_test_run(self.__config.testrun_id)
@@ -85,3 +85,14 @@ class Service:
     def __update_test_run_with_attachments(self, test_run: TestRun):
         test_run.attachments.extend(self.__upload_attachments())
         self.__api_client.update_test_run(test_run)
+
+    def __write_to_output(self, content: str):
+        DirWorker.create_dir(self.__config.output)
+
+        with open(self.__config.output, "w") as text_file:
+            text_file.write(content)
+
+    def create_filter_for_test_framework(self):
+        autotests_filter = self.__autotests_filter.create_filter()
+
+        self.__write_to_output(autotests_filter)

{testit_cli-2.1.0 → testit_cli-2.1.2}/src/testit_cli/service_factory.py

@@ -1,3 +1,4 @@
+from .autotests_filter import AutotestsFilter
 from .logger import Logger
 from .apiclient import ApiClient
 from .importer import Importer
@@ -7,12 +8,13 @@ from .models.config import Config
 
 
 class ServiceFactory:
-    @classmethod
-    def get(cls, config: Config) -> Service:
+    @staticmethod
+    def get(config: Config) -> Service:
         Logger.register_logger(config.is_debug)
 
         api_client = ApiClient(config.url, config.token, config.disable_cert_validation)
         parser = Parser(config)
         importer = Importer(api_client, config)
+        autotests_filter = AutotestsFilter(api_client, config)
 
-        return Service(config, api_client, parser, importer)
+        return Service(config, api_client, parser, importer, autotests_filter)

{testit_cli-2.1.0 → testit_cli-2.1.2}/src/testit_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: testit-cli
-Version: 2.1.0
+Version: 2.1.2
 Summary: This tool is the command line wrapper of Test IT allowing you to upload the test results in real time to Test IT
 Home-page: https://pypi.org/project/testit-cli/
 Author: Integration team
@@ -16,10 +16,19 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: testit-api-client==4.2.0
+Requires-Dist: testit-api-client==5.0.0
 Requires-Dist: validators
 Requires-Dist: tqdm
 Requires-Dist: click~=8.0.4
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 # Test IT CLI
 

{testit_cli-2.1.0 → testit_cli-2.1.2}/src/testit_cli.egg-info/SOURCES.txt

@@ -4,10 +4,12 @@ setup.py
 src/testit_cli/__init__.py
 src/testit_cli/__main__.py
 src/testit_cli/apiclient.py
+src/testit_cli/autotests_filter.py
 src/testit_cli/click_commands.py
 src/testit_cli/converter.py
 src/testit_cli/dir_worker.py
 src/testit_cli/file_worker.py
+src/testit_cli/filter_factory.py
 src/testit_cli/importer.py
 src/testit_cli/logger.py
 src/testit_cli/parser.py

{testit_cli-2.1.0 → testit_cli-2.1.2}/src/testit_cli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-testit-api-client==4.2.0
+testit-api-client==5.0.0
 validators
 tqdm
 click~=8.0.4

{testit_cli-2.1.0 → testit_cli-2.1.2}/tests/test_click.py

@@ -11,7 +11,7 @@ def runner():
 
 
 def test_run_without_command(runner):
-    message = "Options:\n  --help  Show this message and exit.\n\nCommands:\n  results  Uploading the test results\n  testrun  Working with the test run\n"
+    message = "Options:\n  --help  Show this message and exit.\n\nCommands:\n  autotests_filter  Creating filter by autotests for test frameworks\n  results           Uploading the test results\n  testrun           Working with the test run\n"
     result = runner.invoke(execute, [])
 
     assert message in result.output