From 5d0c8271ed337a1cee20cd5e0b8faf57c75eb1e3 Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Mon, 1 Jul 2024 15:39:40 +0000 Subject: [PATCH 001/111] Update versions in application files --- components/package.json | 2 +- docs/content/en/getting_started/upgrading/2.37.md | 7 +++++++ dojo/__init__.py | 2 +- helm/defectdojo/Chart.yaml | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 docs/content/en/getting_started/upgrading/2.37.md diff --git a/components/package.json b/components/package.json index ae18f7927c..ab3201e6a4 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.36.0", + "version": "2.37.0-dev", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/docs/content/en/getting_started/upgrading/2.37.md b/docs/content/en/getting_started/upgrading/2.37.md new file mode 100644 index 0000000000..6445a74c76 --- /dev/null +++ b/docs/content/en/getting_started/upgrading/2.37.md @@ -0,0 +1,7 @@ +--- +title: 'Upgrading to DefectDojo Version 2.37.x' +toc_hide: true +weight: -20240701 +description: No special instructions. +--- +There are no special instructions for upgrading to 2.37.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.37.0) for the contents of the release. diff --git a/dojo/__init__.py b/dojo/__init__.py index b6ae12017f..707177ee3e 100644 --- a/dojo/__init__.py +++ b/dojo/__init__.py @@ -4,6 +4,6 @@ # Django starts so that shared_task will use this app. from .celery import app as celery_app # noqa: F401 -__version__ = '2.36.0' +__version__ = '2.37.0-dev' __url__ = 'https://github.com/DefectDojo/django-DefectDojo' __docs__ = 'https://documentation.defectdojo.com' diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index 3ede21350c..ab21a0409c 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.36.0" +appVersion: "2.37.0-dev" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.137 +version: 1.6.138-dev icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap From cb37e7a4afcbb432ccf4a3a8f3bc58e343fc413d Mon Sep 17 00:00:00 2001 From: DefectDojo Date: Mon, 1 Jul 2024 15:46:55 +0000 Subject: [PATCH 002/111] Update helm lock file Signed-off-by: DefectDojo --- helm/defectdojo/Chart.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/defectdojo/Chart.lock b/helm/defectdojo/Chart.lock index 74468c83ba..83c44cb3c1 100644 --- a/helm/defectdojo/Chart.lock +++ b/helm/defectdojo/Chart.lock @@ -4,7 +4,7 @@ dependencies: version: 9.19.1 - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 15.5.9 + version: 15.5.11 - name: postgresql-ha repository: https://charts.bitnami.com/bitnami version: 9.4.11 @@ -14,5 +14,5 @@ dependencies: - name: redis repository: https://charts.bitnami.com/bitnami version: 19.5.5 -digest: sha256:7ad88ea953ebef3acbd1270eeae206e4e650f2fb20f754e0d912688795500b18 -generated: "2024-06-24T18:56:55.876075791Z" +digest: sha256:19929ba605dd8c095aaa65be37fef1330044dace57397aa023a0b73764b32599 +generated: "2024-07-01T15:46:45.361963299Z" From b43d8f06fc04801d3ca0b0a2c6ee40e70b7cd9dc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 12:03:58 -0500 Subject: [PATCH 003/111] Update Helm release redis from 19.5.5 to ~19.6.0 (helm/defectdojo/Chart.yaml) (#10461) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm/defectdojo/Chart.lock | 6 +++--- helm/defectdojo/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helm/defectdojo/Chart.lock b/helm/defectdojo/Chart.lock index 83c44cb3c1..9bd08b08b0 100644 --- a/helm/defectdojo/Chart.lock +++ b/helm/defectdojo/Chart.lock @@ -13,6 +13,6 @@ dependencies: version: 14.4.4 - name: redis repository: https://charts.bitnami.com/bitnami - version: 19.5.5 -digest: sha256:19929ba605dd8c095aaa65be37fef1330044dace57397aa023a0b73764b32599 -generated: "2024-07-01T15:46:45.361963299Z" + version: 19.6.0 +digest: sha256:d00f56b5b3cf6525a4e06c82789ec7dd68526959ce38ea50e5251151535dcd8b +generated: "2024-07-01T16:26:01.747085461Z" diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index ab21a0409c..58e421ed49 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -27,6 +27,6 @@ dependencies: repository: "https://charts.bitnami.com/bitnami" condition: rabbitmq.enabled - name: redis - version: ~19.5.0 + version: ~19.6.0 repository: "https://charts.bitnami.com/bitnami" condition: redis.enabled From 569c82654130f70051918982c240d8c95ef422ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:07:21 -0500 Subject: [PATCH 004/111] Bump python-gitlab from 4.6.0 to 4.7.0 (#10469) Bumps [python-gitlab](https://github.com/python-gitlab/python-gitlab) from 4.6.0 to 4.7.0. - [Release notes](https://github.com/python-gitlab/python-gitlab/releases) - [Changelog](https://github.com/python-gitlab/python-gitlab/blob/main/CHANGELOG.md) - [Commits](https://github.com/python-gitlab/python-gitlab/compare/v4.6.0...v4.7.0) --- updated-dependencies: - dependency-name: python-gitlab dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 27eb0b2603..5fb1370338 100644 --- a/requirements.txt +++ b/requirements.txt @@ -52,7 +52,7 @@ social-auth-core==4.5.4 Python-jose==3.3.0 gitpython==3.1.43 debugpy==1.8.2 -python-gitlab==4.6.0 +python-gitlab==4.7.0 cpe==1.2.1 packageurl-python==0.15.1 django-crum==0.7.9 From be7051ab9b6ba7091193338ef61d58d402ba8457 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:25:54 -0500 Subject: [PATCH 005/111] Update dependency ruff from 0.4.10 to v0.5.0 (requirements-lint.txt) (#10466) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements-lint.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-lint.txt b/requirements-lint.txt index e022cdb619..0eceab328e 100644 --- a/requirements-lint.txt +++ b/requirements-lint.txt @@ -1 +1 @@ -ruff==0.4.10 \ No newline at end of file +ruff==0.5.0 \ No newline at end of file From dff84bdfead2269ee62f717931681c31be5f3b7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 17:00:46 -0500 Subject: [PATCH 006/111] Bump boto3 from 1.34.135 to 1.34.136 (#10480) Bumps [boto3](https://github.com/boto/boto3) from 1.34.135 to 1.34.136. - [Release notes](https://github.com/boto/boto3/releases) - [Commits](https://github.com/boto/boto3/compare/1.34.135...1.34.136) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5fb1370338..17efe04d4c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -75,7 +75,7 @@ django-ratelimit==4.1.0 argon2-cffi==23.1.0 blackduck==1.1.3 pycurl==7.45.3 # Required for Celery Broker AWS (SQS) support -boto3==1.34.135 # Required for Celery Broker AWS (SQS) support +boto3==1.34.136 # Required for Celery Broker AWS (SQS) support netaddr==1.3.0 vulners==2.1.7 fontawesomefree==6.5.1 From 039f3cb87d88fee817e330238b5740c28d43b83b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 17:02:48 -0500 Subject: [PATCH 007/111] Bump django-test-migrations from 1.3.0 to 1.4.0 (#10481) Bumps [django-test-migrations](https://github.com/wemake-services/django-test-migrations) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/wemake-services/django-test-migrations/releases) - [Changelog](https://github.com/wemake-services/django-test-migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/wemake-services/django-test-migrations/compare/1.3.0...1.4.0) --- updated-dependencies: - dependency-name: django-test-migrations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 17efe04d4c..344f2a4e75 100644 --- a/requirements.txt +++ b/requirements.txt @@ -67,7 +67,7 @@ PyJWT==2.8.0 cvss==3.1 django-fieldsignals==0.7.0 hyperlink==21.0.0 -django-test-migrations==1.3.0 +django-test-migrations==1.4.0 djangosaml2==1.9.3 drf-spectacular==0.27.2 drf-spectacular-sidecar==2024.6.1 From ed1551adf527adb412cf908926a3d005167fe0ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 17:03:34 -0500 Subject: [PATCH 008/111] Bump openpyxl from 3.1.4 to 3.1.5 (#10478) Bumps [openpyxl](https://openpyxl.readthedocs.io) from 3.1.4 to 3.1.5. --- updated-dependencies: - dependency-name: openpyxl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 344f2a4e75..b867d11e39 100644 --- a/requirements.txt +++ b/requirements.txt @@ -33,7 +33,7 @@ PyGithub==1.58.2 lxml==5.2.2 Markdown==3.6 mysqlclient==2.1.1 -openpyxl==3.1.4 +openpyxl==3.1.5 Pillow==10.3.0 # required by django-imagekit psycopg2-binary==2.9.9 cryptography==42.0.8 From aae8b00badac520e4b7b7eb7deec21ee77f26297 Mon Sep 17 00:00:00 2001 From: kiblik <5609770+kiblik@users.noreply.github.com> Date: Tue, 2 Jul 2024 04:23:43 +0200 Subject: [PATCH 009/111] Ruff: add and fix TID (#10113) --- ruff.toml | 1 + unittests/authorization/test_authorization.py | 3 +-- unittests/authorization/test_authorization_decorators.py | 3 +-- unittests/authorization/test_authorization_tags.py | 3 +-- unittests/tools/test_acunetix_parser.py | 3 +-- unittests/tools/test_anchore_engine_parser.py | 3 +-- unittests/tools/test_anchore_enterprise_parser.py | 3 +-- unittests/tools/test_anchore_grype_parser.py | 3 +-- unittests/tools/test_anchorectl_policies_parser.py | 3 +-- unittests/tools/test_anchorectl_vulns_parser.py | 3 +-- unittests/tools/test_api_blackduck_parser.py | 3 +-- unittests/tools/test_api_cobalt_importer.py | 3 +-- unittests/tools/test_api_cobalt_parser.py | 3 +-- unittests/tools/test_api_sonarqube_importer.py | 3 +-- unittests/tools/test_api_sonarqube_parser.py | 3 +-- unittests/tools/test_api_vulners_parser.py | 3 +-- unittests/tools/test_appspider_parser.py | 3 +-- unittests/tools/test_aqua_parser.py | 3 +-- unittests/tools/test_arachni_parser.py | 3 +-- unittests/tools/test_asff_parser.py | 3 +-- unittests/tools/test_auditjs_parser.py | 3 +-- unittests/tools/test_aws_prowler_parser.py | 3 +-- unittests/tools/test_aws_prowler_v3_parser.py | 3 +-- unittests/tools/test_awssecurityhub_parser.py | 3 +-- .../tools/test_azure_security_center_recommendations_parser.py | 3 +-- unittests/tools/test_bandit_parser.py | 3 +-- unittests/tools/test_blackduck_binary_analysis_parser.py | 3 +-- unittests/tools/test_blackduck_component_risk_parser.py | 3 +-- unittests/tools/test_blackduck_parser.py | 3 +-- unittests/tools/test_brakeman_parser.py | 3 +-- unittests/tools/test_bugcrowd_parser.py | 3 +-- unittests/tools/test_bundler_audit_parser.py | 3 +-- unittests/tools/test_burp_api_parser.py | 3 +-- unittests/tools/test_burp_dastardly_parser.py | 3 +-- unittests/tools/test_burp_enterprise_parser.py | 3 +-- unittests/tools/test_burp_graphql_parser.py | 3 +-- unittests/tools/test_burp_parser.py | 3 +-- unittests/tools/test_cargo_audit_parser.py | 3 +-- unittests/tools/test_checkmarx_one_parser.py | 3 +-- unittests/tools/test_checkmarx_osa_parser.py | 3 +-- unittests/tools/test_checkmarx_parser.py | 3 +-- unittests/tools/test_checkov_parser.py | 3 +-- unittests/tools/test_chefinspect_parser.py | 3 +-- unittests/tools/test_clair_parser.py | 3 +-- unittests/tools/test_cloudsploit_parser.py | 3 +-- unittests/tools/test_cobalt_parser.py | 3 +-- unittests/tools/test_codechecker_parser.py | 3 +-- unittests/tools/test_contrast_parser.py | 3 +-- unittests/tools/test_coverity_api_parser.py | 3 +-- unittests/tools/test_crashtest_security_parser.py | 3 +-- unittests/tools/test_cred_scan_parser.py | 3 +-- unittests/tools/test_crunch42_parser.py | 3 +-- unittests/tools/test_cyclonedx_parser.py | 3 +-- unittests/tools/test_dawnscanner_parser.py | 3 +-- unittests/tools/test_deepfence_threatmapper_parser.py | 3 +-- unittests/tools/test_dependency_check_parser.py | 3 +-- unittests/tools/test_dependency_track_parser.py | 3 +-- unittests/tools/test_detect_secrets_parser.py | 3 +-- unittests/tools/test_dockerbench_parser.py | 3 +-- unittests/tools/test_dockle_parser.py | 3 +-- unittests/tools/test_drheader_parser.py | 3 +-- unittests/tools/test_dsop_parser.py | 3 +-- unittests/tools/test_eslint_parser.py | 3 +-- unittests/tools/test_fortify_parser.py | 3 +-- unittests/tools/test_gcloud_artifact_scan_parser.py | 3 +-- unittests/tools/test_generic_parser.py | 3 +-- unittests/tools/test_ggshield_parser.py | 3 +-- unittests/tools/test_github_vulnerability_parser.py | 3 +-- unittests/tools/test_gitlab_api_fuzzing_parser.py | 3 +-- unittests/tools/test_gitlab_container_scan_parser.py | 3 +-- unittests/tools/test_gitlab_dast_parser.py | 3 +-- unittests/tools/test_gitlab_dep_scan_parser.py | 3 +-- unittests/tools/test_gitlab_sast_parser.py | 3 +-- unittests/tools/test_gitlab_secret_detection_report_parser.py | 3 +-- unittests/tools/test_gitleaks_parser.py | 3 +-- unittests/tools/test_gosec_parser.py | 3 +-- unittests/tools/test_h1_parser.py | 3 +-- unittests/tools/test_hadolint_parser.py | 3 +-- unittests/tools/test_harbor_vulnerability_parser.py | 3 +-- unittests/tools/test_hcl_appscan_parser.py | 3 +-- unittests/tools/test_horusec_parser.py | 3 +-- unittests/tools/test_huskyci_parser.py | 3 +-- unittests/tools/test_ibm_app_parser.py | 3 +-- unittests/tools/test_immuniweb_parser.py | 3 +-- unittests/tools/test_intsights_parser.py | 3 +-- unittests/tools/test_jfrog_xray_api_summary_artifact_parser.py | 3 +-- .../tools/test_jfrog_xray_on_demand_binary_scan_parser.py | 3 +-- unittests/tools/test_jfrog_xray_unified_parser.py | 3 +-- unittests/tools/test_jfrogxray_parser.py | 3 +-- unittests/tools/test_kics_parser.py | 3 +-- unittests/tools/test_kiuwan_parser.py | 3 +-- unittests/tools/test_kubeaudit_parser.py | 3 +-- unittests/tools/test_kubebench_parser.py | 3 +-- unittests/tools/test_kubescape_parser.py | 3 +-- unittests/tools/test_mend_parser.py | 3 +-- unittests/tools/test_meterian_parser.py | 3 +-- unittests/tools/test_microfocus_webinspect_parser.py | 3 +-- unittests/tools/test_mobsf_parser.py | 3 +-- unittests/tools/test_mobsfscan_parser.py | 3 +-- unittests/tools/test_mozilla_observatory_parser.py | 3 +-- unittests/tools/test_ms_defender_parser.py | 3 +-- unittests/tools/test_nancy_parser.py | 3 +-- unittests/tools/test_netsparker_parser.py | 3 +-- unittests/tools/test_neuvector_compliance_parser.py | 3 +-- unittests/tools/test_neuvector_parser.py | 3 +-- unittests/tools/test_nexpose_parser.py | 3 +-- unittests/tools/test_nikto_parser.py | 3 +-- unittests/tools/test_nmap_parser.py | 3 +-- unittests/tools/test_npm_audit_7_plus_parser.py | 3 +-- unittests/tools/test_npm_audit_parser.py | 3 +-- unittests/tools/test_nsp_parser.py | 3 +-- unittests/tools/test_nuclei_parser.py | 3 +-- unittests/tools/test_openscap_parser.py | 3 +-- unittests/tools/test_openvas_parser.py | 3 +-- unittests/tools/test_ort_parser.py | 3 +-- unittests/tools/test_ossindex_devaudit_parser.py | 3 +-- unittests/tools/test_osv_scanner_parser.py | 3 +-- unittests/tools/test_outpost24_parser.py | 3 +-- unittests/tools/test_php_security_audit_v2_parser.py | 3 +-- unittests/tools/test_php_symfony_security_check_parser.py | 3 +-- unittests/tools/test_pip_audit_parser.py | 3 +-- unittests/tools/test_pmd_parser.py | 3 +-- unittests/tools/test_popeye_parser.py | 3 +-- unittests/tools/test_progpilot_parser.py | 3 +-- unittests/tools/test_pwn_sast_parser.py | 3 +-- unittests/tools/test_qualys_infrascan_webgui_parser.py | 3 +-- unittests/tools/test_qualys_parser.py | 3 +-- unittests/tools/test_qualys_webapp_parser.py | 3 +-- unittests/tools/test_redhatsatellite_parser.py | 3 +-- unittests/tools/test_retirejs_parser.py | 3 +-- unittests/tools/test_risk_recon_parser.py | 3 +-- unittests/tools/test_rubocop_parser.py | 3 +-- unittests/tools/test_rusty_hog_parser.py | 3 +-- unittests/tools/test_sarif_parser.py | 3 +-- unittests/tools/test_scantist_parser.py | 3 +-- unittests/tools/test_scout_suite_parser.py | 3 +-- unittests/tools/test_semgrep_parser.py | 3 +-- unittests/tools/test_skf_parser.py | 3 +-- unittests/tools/test_snyk_code_parser.py | 3 +-- unittests/tools/test_snyk_parser.py | 3 +-- unittests/tools/test_solar_appscreener_parser.py | 3 +-- unittests/tools/test_sonarqube_parser.py | 3 +-- unittests/tools/test_sonatype_parser.py | 3 +-- unittests/tools/test_spotbugs_parser.py | 3 +-- unittests/tools/test_ssh_audit_parser.py | 3 +-- unittests/tools/test_ssl_labs_parser.py | 3 +-- unittests/tools/test_sslscan_parser.py | 3 +-- unittests/tools/test_sslyze_parser.py | 3 +-- unittests/tools/test_talisman_parser.py | 3 +-- unittests/tools/test_tenable_parser.py | 3 +-- unittests/tools/test_terrascan_parser.py | 3 +-- unittests/tools/test_testssl_parser.py | 3 +-- unittests/tools/test_tfsec_parser.py | 3 +-- unittests/tools/test_trivy_operator_parser.py | 3 +-- unittests/tools/test_trivy_parser.py | 3 +-- unittests/tools/test_trufflehog3_parser.py | 3 +-- unittests/tools/test_trufflehog_parser.py | 3 +-- unittests/tools/test_trustwave_fusion_api_parser.py | 3 +-- unittests/tools/test_trustwave_parser.py | 3 +-- unittests/tools/test_twistlock_parser.py | 3 +-- unittests/tools/test_vcg_parser.py | 3 +-- unittests/tools/test_veracode_parser.py | 3 +-- unittests/tools/test_veracode_sca_parser.py | 3 +-- unittests/tools/test_wapiti_parser.py | 3 +-- unittests/tools/test_wazuh_parser.py | 3 +-- unittests/tools/test_wfuzz_parser.py | 3 +-- unittests/tools/test_whitehat_sentinel_parser.py | 3 +-- unittests/tools/test_wiz_parser.py | 3 +-- unittests/tools/test_wpscan_parser.py | 3 +-- unittests/tools/test_xanitizer_parser.py | 3 +-- unittests/tools/test_yarn_audit_parser.py | 3 +-- unittests/tools/test_zap_parser.py | 3 +-- 172 files changed, 172 insertions(+), 342 deletions(-) diff --git a/ruff.toml b/ruff.toml index 1349d475e9..32ad177291 100644 --- a/ruff.toml +++ b/ruff.toml @@ -51,6 +51,7 @@ select = [ "INP", "SLOT", "RSE", + "TID", "PD", "PGH", "TRY003", diff --git a/unittests/authorization/test_authorization.py b/unittests/authorization/test_authorization.py index 0240171152..726bfb544a 100644 --- a/unittests/authorization/test_authorization.py +++ b/unittests/authorization/test_authorization.py @@ -35,8 +35,7 @@ Stub_Finding, Test, ) - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestAuthorization(DojoTestCase): diff --git a/unittests/authorization/test_authorization_decorators.py b/unittests/authorization/test_authorization_decorators.py index ea5d76eee8..7e5b5d04a3 100644 --- a/unittests/authorization/test_authorization_decorators.py +++ b/unittests/authorization/test_authorization_decorators.py @@ -8,8 +8,7 @@ from dojo.authorization.authorization_decorators import user_is_authorized, user_is_configuration_authorized from dojo.authorization.roles_permissions import Permissions from dojo.models import Product_Type - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestAuthorizationDecorators(DojoTestCase): diff --git a/unittests/authorization/test_authorization_tags.py b/unittests/authorization/test_authorization_tags.py index 6a31ca5666..8b49c25a18 100644 --- a/unittests/authorization/test_authorization_tags.py +++ b/unittests/authorization/test_authorization_tags.py @@ -10,8 +10,7 @@ has_object_permission, user_has_configuration_permission_without_group, ) - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestAuthorizationTags(DojoTestCase): diff --git a/unittests/tools/test_acunetix_parser.py b/unittests/tools/test_acunetix_parser.py index cd11c874fb..eabe5e2322 100644 --- a/unittests/tools/test_acunetix_parser.py +++ b/unittests/tools/test_acunetix_parser.py @@ -3,8 +3,7 @@ from dojo.models import Test from dojo.tools.acunetix.parser import AcunetixParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestAcunetixParser(DojoTestCase): diff --git a/unittests/tools/test_anchore_engine_parser.py b/unittests/tools/test_anchore_engine_parser.py index 29946312a8..ee4f2ae509 100644 --- a/unittests/tools/test_anchore_engine_parser.py +++ b/unittests/tools/test_anchore_engine_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.anchore_engine.parser import AnchoreEngineParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestAnchoreEngineParser(DojoTestCase): diff --git a/unittests/tools/test_anchore_enterprise_parser.py b/unittests/tools/test_anchore_enterprise_parser.py index 3ea2286a4c..1d286d8a84 100644 --- a/unittests/tools/test_anchore_enterprise_parser.py +++ b/unittests/tools/test_anchore_enterprise_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.anchore_enterprise.parser import AnchoreEnterpriseParser, extract_vulnerability_id, search_filepath - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestAnchoreEnterpriseParser(DojoTestCase): diff --git a/unittests/tools/test_anchore_grype_parser.py b/unittests/tools/test_anchore_grype_parser.py index 0b41180de1..f20b950913 100644 --- a/unittests/tools/test_anchore_grype_parser.py +++ b/unittests/tools/test_anchore_grype_parser.py @@ -1,7 +1,6 @@ from dojo.models import Finding, Test from dojo.tools.anchore_grype.parser import AnchoreGrypeParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestAnchoreGrypeParser(DojoTestCase): diff --git a/unittests/tools/test_anchorectl_policies_parser.py b/unittests/tools/test_anchorectl_policies_parser.py index 87968ea792..0bb48d0521 100644 --- a/unittests/tools/test_anchorectl_policies_parser.py +++ b/unittests/tools/test_anchorectl_policies_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.anchorectl_policies.parser import AnchoreCTLPoliciesParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestAnchoreCTLPoliciesParser(DojoTestCase): diff --git a/unittests/tools/test_anchorectl_vulns_parser.py b/unittests/tools/test_anchorectl_vulns_parser.py index 40295ec027..384de7aba8 100644 --- a/unittests/tools/test_anchorectl_vulns_parser.py +++ b/unittests/tools/test_anchorectl_vulns_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.anchorectl_vulns.parser import AnchoreCTLVulnsParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestAnchoreCTLVulnsParser(DojoTestCase): diff --git a/unittests/tools/test_api_blackduck_parser.py b/unittests/tools/test_api_blackduck_parser.py index d97b301f13..a8922ca99b 100644 --- a/unittests/tools/test_api_blackduck_parser.py +++ b/unittests/tools/test_api_blackduck_parser.py @@ -1,8 +1,7 @@ from dojo.models import SEVERITIES, Test from dojo.tools.api_blackduck.parser import ApiBlackduckParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestApiBlackduckParser(DojoTestCase): diff --git a/unittests/tools/test_api_cobalt_importer.py b/unittests/tools/test_api_cobalt_importer.py index 9eb78e373b..8361ac9b10 100644 --- a/unittests/tools/test_api_cobalt_importer.py +++ b/unittests/tools/test_api_cobalt_importer.py @@ -5,8 +5,7 @@ from dojo.models import Engagement, Product, Product_API_Scan_Configuration, Test, Tool_Configuration, Tool_Type from dojo.tools.api_cobalt.importer import CobaltApiImporter - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestCobaltApiImporter(DojoTestCase): diff --git a/unittests/tools/test_api_cobalt_parser.py b/unittests/tools/test_api_cobalt_parser.py index 956bce388a..644dec0e5f 100644 --- a/unittests/tools/test_api_cobalt_parser.py +++ b/unittests/tools/test_api_cobalt_parser.py @@ -3,8 +3,7 @@ from dojo.models import Test, Test_Type from dojo.tools.api_cobalt.parser import ApiCobaltParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestApiCobaltParser(DojoTestCase): diff --git a/unittests/tools/test_api_sonarqube_importer.py b/unittests/tools/test_api_sonarqube_importer.py index 44e29f011b..0b30008c1c 100644 --- a/unittests/tools/test_api_sonarqube_importer.py +++ b/unittests/tools/test_api_sonarqube_importer.py @@ -5,8 +5,7 @@ from dojo.models import Engagement, Product, Product_API_Scan_Configuration, Test from dojo.tools.api_sonarqube.importer import SonarQubeApiImporter - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path def dummy_product(self, *args, **kwargs): diff --git a/unittests/tools/test_api_sonarqube_parser.py b/unittests/tools/test_api_sonarqube_parser.py index dd8de04c3b..ffb33b76ee 100644 --- a/unittests/tools/test_api_sonarqube_parser.py +++ b/unittests/tools/test_api_sonarqube_parser.py @@ -11,8 +11,7 @@ Tool_Type, ) from dojo.tools.api_sonarqube.parser import ApiSonarQubeParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase def dummy_product(self, *args, **kwargs): diff --git a/unittests/tools/test_api_vulners_parser.py b/unittests/tools/test_api_vulners_parser.py index ea370389ba..bd2e4df212 100644 --- a/unittests/tools/test_api_vulners_parser.py +++ b/unittests/tools/test_api_vulners_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.api_vulners.parser import ApiVulnersParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestApiVulnersParser(DojoTestCase): diff --git a/unittests/tools/test_appspider_parser.py b/unittests/tools/test_appspider_parser.py index 094ca3e01e..0d94c4b719 100644 --- a/unittests/tools/test_appspider_parser.py +++ b/unittests/tools/test_appspider_parser.py @@ -2,8 +2,7 @@ from dojo.models import Engagement, Finding, Product, Test from dojo.tools.appspider.parser import AppSpiderParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestAppSpiderParser(DojoTestCase): diff --git a/unittests/tools/test_aqua_parser.py b/unittests/tools/test_aqua_parser.py index 89f16334fa..39191a7e3d 100644 --- a/unittests/tools/test_aqua_parser.py +++ b/unittests/tools/test_aqua_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.aqua.parser import AquaParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestAquaParser(DojoTestCase): diff --git a/unittests/tools/test_arachni_parser.py b/unittests/tools/test_arachni_parser.py index ca28de74b4..ca75a6ed43 100644 --- a/unittests/tools/test_arachni_parser.py +++ b/unittests/tools/test_arachni_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.arachni.parser import ArachniParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestArachniParser(DojoTestCase): diff --git a/unittests/tools/test_asff_parser.py b/unittests/tools/test_asff_parser.py index 666e7bf8e7..68c409c166 100644 --- a/unittests/tools/test_asff_parser.py +++ b/unittests/tools/test_asff_parser.py @@ -4,8 +4,7 @@ from dojo.models import Endpoint, Test from dojo.tools.asff.parser import AsffParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path def sample_path(file_name): diff --git a/unittests/tools/test_auditjs_parser.py b/unittests/tools/test_auditjs_parser.py index 629a6c9012..789efc73d0 100644 --- a/unittests/tools/test_auditjs_parser.py +++ b/unittests/tools/test_auditjs_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.auditjs.parser import AuditJSParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestAuditJSParser(DojoTestCase): diff --git a/unittests/tools/test_aws_prowler_parser.py b/unittests/tools/test_aws_prowler_parser.py index e4e1ee8392..2c33d706bd 100644 --- a/unittests/tools/test_aws_prowler_parser.py +++ b/unittests/tools/test_aws_prowler_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.aws_prowler.parser import AWSProwlerParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestAwsProwlerParser(DojoTestCase): diff --git a/unittests/tools/test_aws_prowler_v3_parser.py b/unittests/tools/test_aws_prowler_v3_parser.py index abbecc578e..c92ff3f922 100644 --- a/unittests/tools/test_aws_prowler_v3_parser.py +++ b/unittests/tools/test_aws_prowler_v3_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.aws_prowler_v3.parser import AWSProwlerV3Parser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestAwsProwlerV3Parser(DojoTestCase): diff --git a/unittests/tools/test_awssecurityhub_parser.py b/unittests/tools/test_awssecurityhub_parser.py index 3734f2e440..7993b065a5 100644 --- a/unittests/tools/test_awssecurityhub_parser.py +++ b/unittests/tools/test_awssecurityhub_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.awssecurityhub.parser import AwsSecurityHubParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path def sample_path(file_name: str): diff --git a/unittests/tools/test_azure_security_center_recommendations_parser.py b/unittests/tools/test_azure_security_center_recommendations_parser.py index 5ce988dfed..e5c9823b14 100644 --- a/unittests/tools/test_azure_security_center_recommendations_parser.py +++ b/unittests/tools/test_azure_security_center_recommendations_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.azure_security_center_recommendations.parser import AzureSecurityCenterRecommendationsParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestAzureSecurityCenterRecommendationsParser(DojoTestCase): diff --git a/unittests/tools/test_bandit_parser.py b/unittests/tools/test_bandit_parser.py index f52a318738..dc4a3f34c8 100644 --- a/unittests/tools/test_bandit_parser.py +++ b/unittests/tools/test_bandit_parser.py @@ -4,8 +4,7 @@ from dojo.models import Test from dojo.tools.bandit.parser import BanditParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestBanditParser(DojoTestCase): diff --git a/unittests/tools/test_blackduck_binary_analysis_parser.py b/unittests/tools/test_blackduck_binary_analysis_parser.py index 89d237c872..29c4130294 100644 --- a/unittests/tools/test_blackduck_binary_analysis_parser.py +++ b/unittests/tools/test_blackduck_binary_analysis_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.blackduck_binary_analysis.parser import BlackduckBinaryAnalysisParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestBlackduckBinaryAnalysisParser(DojoTestCase): diff --git a/unittests/tools/test_blackduck_component_risk_parser.py b/unittests/tools/test_blackduck_component_risk_parser.py index 7ad8db6230..2a520c33aa 100644 --- a/unittests/tools/test_blackduck_component_risk_parser.py +++ b/unittests/tools/test_blackduck_component_risk_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.blackduck_component_risk.parser import BlackduckComponentRiskParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestBlackduckComponentRiskParser(DojoTestCase): diff --git a/unittests/tools/test_blackduck_parser.py b/unittests/tools/test_blackduck_parser.py index 1eaacd157a..96c0f2eac3 100644 --- a/unittests/tools/test_blackduck_parser.py +++ b/unittests/tools/test_blackduck_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.blackduck.parser import BlackduckParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestBlackduckHubParser(DojoTestCase): diff --git a/unittests/tools/test_brakeman_parser.py b/unittests/tools/test_brakeman_parser.py index c8e3f195b6..0c8e4a43c8 100644 --- a/unittests/tools/test_brakeman_parser.py +++ b/unittests/tools/test_brakeman_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.brakeman.parser import BrakemanParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestBrakemanParser(DojoTestCase): diff --git a/unittests/tools/test_bugcrowd_parser.py b/unittests/tools/test_bugcrowd_parser.py index f21451e7c2..dc39110fb9 100644 --- a/unittests/tools/test_bugcrowd_parser.py +++ b/unittests/tools/test_bugcrowd_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.bugcrowd.parser import BugCrowdParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestBugCrowdParser(DojoTestCase): diff --git a/unittests/tools/test_bundler_audit_parser.py b/unittests/tools/test_bundler_audit_parser.py index 612f48007e..b08834c38b 100644 --- a/unittests/tools/test_bundler_audit_parser.py +++ b/unittests/tools/test_bundler_audit_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.bundler_audit.parser import BundlerAuditParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestBundlerAuditParser(DojoTestCase): diff --git a/unittests/tools/test_burp_api_parser.py b/unittests/tools/test_burp_api_parser.py index 3217261faa..bbd36e634a 100644 --- a/unittests/tools/test_burp_api_parser.py +++ b/unittests/tools/test_burp_api_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.burp_api.parser import BurpApiParser, convert_confidence, convert_severity - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestParser(DojoTestCase): diff --git a/unittests/tools/test_burp_dastardly_parser.py b/unittests/tools/test_burp_dastardly_parser.py index d7e16b48ab..3c17bcb091 100644 --- a/unittests/tools/test_burp_dastardly_parser.py +++ b/unittests/tools/test_burp_dastardly_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.burp_dastardly.parser import BurpDastardlyParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestBurpParser(DojoTestCase): diff --git a/unittests/tools/test_burp_enterprise_parser.py b/unittests/tools/test_burp_enterprise_parser.py index 0aeb7c0302..cbbdec18ac 100644 --- a/unittests/tools/test_burp_enterprise_parser.py +++ b/unittests/tools/test_burp_enterprise_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.burp_enterprise.parser import BurpEnterpriseParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestBurpEnterpriseParser(DojoTestCase): diff --git a/unittests/tools/test_burp_graphql_parser.py b/unittests/tools/test_burp_graphql_parser.py index cbc1ca8d5a..1574d4f3e0 100644 --- a/unittests/tools/test_burp_graphql_parser.py +++ b/unittests/tools/test_burp_graphql_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.burp_graphql.parser import BurpGraphQLParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestBurpGraphQLParser(DojoTestCase): diff --git a/unittests/tools/test_burp_parser.py b/unittests/tools/test_burp_parser.py index f29aea11ad..12aad2405a 100644 --- a/unittests/tools/test_burp_parser.py +++ b/unittests/tools/test_burp_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.burp.parser import BurpParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestBurpParser(DojoTestCase): diff --git a/unittests/tools/test_cargo_audit_parser.py b/unittests/tools/test_cargo_audit_parser.py index 5a1bb6aceb..c1f3c62291 100644 --- a/unittests/tools/test_cargo_audit_parser.py +++ b/unittests/tools/test_cargo_audit_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.cargo_audit.parser import CargoAuditParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestCargoAuditParser(DojoTestCase): diff --git a/unittests/tools/test_checkmarx_one_parser.py b/unittests/tools/test_checkmarx_one_parser.py index 74a112a9ec..bc234f8e7b 100644 --- a/unittests/tools/test_checkmarx_one_parser.py +++ b/unittests/tools/test_checkmarx_one_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.checkmarx_one.parser import CheckmarxOneParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestCheckmarxOneParser(DojoTestCase): diff --git a/unittests/tools/test_checkmarx_osa_parser.py b/unittests/tools/test_checkmarx_osa_parser.py index afefb96821..bfe1590c77 100644 --- a/unittests/tools/test_checkmarx_osa_parser.py +++ b/unittests/tools/test_checkmarx_osa_parser.py @@ -2,8 +2,7 @@ from dojo.models import Engagement, Product, Test from dojo.tools.checkmarx_osa.parser import CheckmarxOsaParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestCheckmarxOsaParser(DojoTestCase): diff --git a/unittests/tools/test_checkmarx_parser.py b/unittests/tools/test_checkmarx_parser.py index 8fb37eff9b..88e5cc965b 100644 --- a/unittests/tools/test_checkmarx_parser.py +++ b/unittests/tools/test_checkmarx_parser.py @@ -3,8 +3,7 @@ from dojo.models import Engagement, Product, Test from dojo.tools.checkmarx.parser import CheckmarxParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestCheckmarxParser(DojoTestCase): diff --git a/unittests/tools/test_checkov_parser.py b/unittests/tools/test_checkov_parser.py index ef9f67dc1c..b626fc952e 100644 --- a/unittests/tools/test_checkov_parser.py +++ b/unittests/tools/test_checkov_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.checkov.parser import CheckovParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestCheckovParser(DojoTestCase): diff --git a/unittests/tools/test_chefinspect_parser.py b/unittests/tools/test_chefinspect_parser.py index 9455020257..d979b4b313 100644 --- a/unittests/tools/test_chefinspect_parser.py +++ b/unittests/tools/test_chefinspect_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.chefinspect.parser import ChefInspectParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestChefInspectParser(DojoTestCase): diff --git a/unittests/tools/test_clair_parser.py b/unittests/tools/test_clair_parser.py index 745b92003d..6ecdbfcd59 100644 --- a/unittests/tools/test_clair_parser.py +++ b/unittests/tools/test_clair_parser.py @@ -1,6 +1,5 @@ from dojo.tools.clair.parser import ClairParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestClairParser(DojoTestCase): diff --git a/unittests/tools/test_cloudsploit_parser.py b/unittests/tools/test_cloudsploit_parser.py index a054848a1b..0e1564390c 100644 --- a/unittests/tools/test_cloudsploit_parser.py +++ b/unittests/tools/test_cloudsploit_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.cloudsploit.parser import CloudsploitParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestCloudsploitParser(DojoTestCase): diff --git a/unittests/tools/test_cobalt_parser.py b/unittests/tools/test_cobalt_parser.py index d3bca067c1..f8f3f90815 100644 --- a/unittests/tools/test_cobalt_parser.py +++ b/unittests/tools/test_cobalt_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.cobalt.parser import CobaltParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestCobaltParser(DojoTestCase): diff --git a/unittests/tools/test_codechecker_parser.py b/unittests/tools/test_codechecker_parser.py index fb118215c7..8c6d9e6cc6 100644 --- a/unittests/tools/test_codechecker_parser.py +++ b/unittests/tools/test_codechecker_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.codechecker.parser import CodeCheckerParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestCodeCheckerParser(DojoTestCase): diff --git a/unittests/tools/test_contrast_parser.py b/unittests/tools/test_contrast_parser.py index 70821628b4..2d48445cd5 100644 --- a/unittests/tools/test_contrast_parser.py +++ b/unittests/tools/test_contrast_parser.py @@ -2,8 +2,7 @@ from dojo.models import Engagement, Product, Test from dojo.tools.contrast.parser import ContrastParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestContrastParser(DojoTestCase): diff --git a/unittests/tools/test_coverity_api_parser.py b/unittests/tools/test_coverity_api_parser.py index 8a480a230d..fd1a268420 100644 --- a/unittests/tools/test_coverity_api_parser.py +++ b/unittests/tools/test_coverity_api_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.coverity_api.parser import CoverityApiParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestZapParser(DojoTestCase): diff --git a/unittests/tools/test_crashtest_security_parser.py b/unittests/tools/test_crashtest_security_parser.py index da05803f97..2eaa5211cd 100644 --- a/unittests/tools/test_crashtest_security_parser.py +++ b/unittests/tools/test_crashtest_security_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.crashtest_security.parser import CrashtestSecurityParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestCrashtestSecurityParser(DojoTestCase): diff --git a/unittests/tools/test_cred_scan_parser.py b/unittests/tools/test_cred_scan_parser.py index c8aebcbdca..af49941f4d 100644 --- a/unittests/tools/test_cred_scan_parser.py +++ b/unittests/tools/test_cred_scan_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.cred_scan.parser import CredScanParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestCredScanParser(DojoTestCase): diff --git a/unittests/tools/test_crunch42_parser.py b/unittests/tools/test_crunch42_parser.py index 3f203bd3c5..57cab2f32e 100644 --- a/unittests/tools/test_crunch42_parser.py +++ b/unittests/tools/test_crunch42_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.crunch42.parser import Crunch42Parser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestCrunch42Parser(DojoTestCase): diff --git a/unittests/tools/test_cyclonedx_parser.py b/unittests/tools/test_cyclonedx_parser.py index 5aa5cd218b..16a346ce16 100644 --- a/unittests/tools/test_cyclonedx_parser.py +++ b/unittests/tools/test_cyclonedx_parser.py @@ -2,8 +2,7 @@ from dojo.models import Finding, Test from dojo.tools.cyclonedx.parser import CycloneDXParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestCyclonedxParser(DojoTestCase): diff --git a/unittests/tools/test_dawnscanner_parser.py b/unittests/tools/test_dawnscanner_parser.py index f0833b61fd..62ccc11c44 100644 --- a/unittests/tools/test_dawnscanner_parser.py +++ b/unittests/tools/test_dawnscanner_parser.py @@ -3,8 +3,7 @@ from dojo.models import Test from dojo.tools.dawnscanner.parser import DawnScannerParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestDawnScannerParser(DojoTestCase): diff --git a/unittests/tools/test_deepfence_threatmapper_parser.py b/unittests/tools/test_deepfence_threatmapper_parser.py index 2dc584b225..8e899a5f3a 100644 --- a/unittests/tools/test_deepfence_threatmapper_parser.py +++ b/unittests/tools/test_deepfence_threatmapper_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.deepfence_threatmapper.parser import DeepfenceThreatmapperParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestDeepfenceThreatmapperParser(DojoTestCase): diff --git a/unittests/tools/test_dependency_check_parser.py b/unittests/tools/test_dependency_check_parser.py index c6a26d1e78..0bf78406f4 100644 --- a/unittests/tools/test_dependency_check_parser.py +++ b/unittests/tools/test_dependency_check_parser.py @@ -5,8 +5,7 @@ from dojo.models import Test from dojo.tools.dependency_check.parser import DependencyCheckParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestFile: diff --git a/unittests/tools/test_dependency_track_parser.py b/unittests/tools/test_dependency_track_parser.py index f2783229d9..41fb2591fa 100644 --- a/unittests/tools/test_dependency_track_parser.py +++ b/unittests/tools/test_dependency_track_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.dependency_track.parser import DependencyTrackParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestDependencyTrackParser(DojoTestCase): diff --git a/unittests/tools/test_detect_secrets_parser.py b/unittests/tools/test_detect_secrets_parser.py index 0c11f06b8f..d403cf7af7 100644 --- a/unittests/tools/test_detect_secrets_parser.py +++ b/unittests/tools/test_detect_secrets_parser.py @@ -4,8 +4,7 @@ from dojo.models import Test from dojo.tools.detect_secrets.parser import DetectSecretsParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestDetectSecretsParser(DojoTestCase): diff --git a/unittests/tools/test_dockerbench_parser.py b/unittests/tools/test_dockerbench_parser.py index 6a52066172..8a2ec6137d 100644 --- a/unittests/tools/test_dockerbench_parser.py +++ b/unittests/tools/test_dockerbench_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.dockerbench.parser import DockerBenchParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestDockerBenchParser(DojoTestCase): diff --git a/unittests/tools/test_dockle_parser.py b/unittests/tools/test_dockle_parser.py index 5baed6455c..1ecd8b2a7b 100644 --- a/unittests/tools/test_dockle_parser.py +++ b/unittests/tools/test_dockle_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.dockle.parser import DockleParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestDockleParser(DojoTestCase): diff --git a/unittests/tools/test_drheader_parser.py b/unittests/tools/test_drheader_parser.py index 9ae187497c..ccda65e286 100644 --- a/unittests/tools/test_drheader_parser.py +++ b/unittests/tools/test_drheader_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.drheader.parser import DrHeaderParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestDrHeaderParser(DojoTestCase): diff --git a/unittests/tools/test_dsop_parser.py b/unittests/tools/test_dsop_parser.py index d4ffd6ff5f..e3a1b8d984 100644 --- a/unittests/tools/test_dsop_parser.py +++ b/unittests/tools/test_dsop_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.dsop.parser import DsopParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestDsopParser(DojoTestCase): diff --git a/unittests/tools/test_eslint_parser.py b/unittests/tools/test_eslint_parser.py index f04d446496..0266860890 100644 --- a/unittests/tools/test_eslint_parser.py +++ b/unittests/tools/test_eslint_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.eslint.parser import ESLintParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestESLintParser(DojoTestCase): diff --git a/unittests/tools/test_fortify_parser.py b/unittests/tools/test_fortify_parser.py index 52140f66a5..c65531fcf5 100644 --- a/unittests/tools/test_fortify_parser.py +++ b/unittests/tools/test_fortify_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.fortify.parser import FortifyParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestFortifyParser(DojoTestCase): diff --git a/unittests/tools/test_gcloud_artifact_scan_parser.py b/unittests/tools/test_gcloud_artifact_scan_parser.py index 762fbbb3b9..c581d9f8f6 100644 --- a/unittests/tools/test_gcloud_artifact_scan_parser.py +++ b/unittests/tools/test_gcloud_artifact_scan_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.gcloud_artifact_scan.parser import GCloudArtifactScanParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestGCloudArtifactScanParser(DojoTestCase): diff --git a/unittests/tools/test_generic_parser.py b/unittests/tools/test_generic_parser.py index 5951f9a413..f8a3f467a7 100644 --- a/unittests/tools/test_generic_parser.py +++ b/unittests/tools/test_generic_parser.py @@ -2,8 +2,7 @@ from dojo.models import Engagement, Finding, Product, Test from dojo.tools.generic.parser import GenericParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestFile: diff --git a/unittests/tools/test_ggshield_parser.py b/unittests/tools/test_ggshield_parser.py index c95a70b8d0..e4163900f1 100644 --- a/unittests/tools/test_ggshield_parser.py +++ b/unittests/tools/test_ggshield_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.ggshield.parser import GgshieldParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestGgshieldParser(DojoTestCase): diff --git a/unittests/tools/test_github_vulnerability_parser.py b/unittests/tools/test_github_vulnerability_parser.py index cff3956675..857d665ebf 100644 --- a/unittests/tools/test_github_vulnerability_parser.py +++ b/unittests/tools/test_github_vulnerability_parser.py @@ -4,8 +4,7 @@ from dojo.models import Test from dojo.tools.github_vulnerability.parser import GithubVulnerabilityParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestGithubVulnerabilityParser(DojoTestCase): diff --git a/unittests/tools/test_gitlab_api_fuzzing_parser.py b/unittests/tools/test_gitlab_api_fuzzing_parser.py index 33698d5d4a..2948134d72 100644 --- a/unittests/tools/test_gitlab_api_fuzzing_parser.py +++ b/unittests/tools/test_gitlab_api_fuzzing_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.gitlab_api_fuzzing.parser import GitlabAPIFuzzingParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestGitlabAPIFuzzingParser(DojoTestCase): diff --git a/unittests/tools/test_gitlab_container_scan_parser.py b/unittests/tools/test_gitlab_container_scan_parser.py index 8aaaca7f18..e4da366286 100644 --- a/unittests/tools/test_gitlab_container_scan_parser.py +++ b/unittests/tools/test_gitlab_container_scan_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.gitlab_container_scan.parser import GitlabContainerScanParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestGitlabContainerScanParser(DojoTestCase): diff --git a/unittests/tools/test_gitlab_dast_parser.py b/unittests/tools/test_gitlab_dast_parser.py index 7d778adc40..4e6cc5d41c 100644 --- a/unittests/tools/test_gitlab_dast_parser.py +++ b/unittests/tools/test_gitlab_dast_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.gitlab_dast.parser import GitlabDastParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestGitlabDastParser(DojoTestCase): diff --git a/unittests/tools/test_gitlab_dep_scan_parser.py b/unittests/tools/test_gitlab_dep_scan_parser.py index 7601438490..a31b98051f 100644 --- a/unittests/tools/test_gitlab_dep_scan_parser.py +++ b/unittests/tools/test_gitlab_dep_scan_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.gitlab_dep_scan.parser import GitlabDepScanParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestGitlabDepScanParser(DojoTestCase): diff --git a/unittests/tools/test_gitlab_sast_parser.py b/unittests/tools/test_gitlab_sast_parser.py index b0acbe3421..16e9ef4ad9 100644 --- a/unittests/tools/test_gitlab_sast_parser.py +++ b/unittests/tools/test_gitlab_sast_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.gitlab_sast.parser import GitlabSastParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestGitlabSastParser(DojoTestCase): diff --git a/unittests/tools/test_gitlab_secret_detection_report_parser.py b/unittests/tools/test_gitlab_secret_detection_report_parser.py index 4c1d60922d..32747f7b88 100644 --- a/unittests/tools/test_gitlab_secret_detection_report_parser.py +++ b/unittests/tools/test_gitlab_secret_detection_report_parser.py @@ -4,8 +4,7 @@ from dojo.tools.gitlab_secret_detection_report.parser import ( GitlabSecretDetectionReportParser, ) - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestGitlabSecretDetectionReportParser(DojoTestCase): diff --git a/unittests/tools/test_gitleaks_parser.py b/unittests/tools/test_gitleaks_parser.py index f3ba72907b..b712777696 100644 --- a/unittests/tools/test_gitleaks_parser.py +++ b/unittests/tools/test_gitleaks_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.gitleaks.parser import GitleaksParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestGitleaksParser(DojoTestCase): diff --git a/unittests/tools/test_gosec_parser.py b/unittests/tools/test_gosec_parser.py index a4274301da..53c79a71ad 100644 --- a/unittests/tools/test_gosec_parser.py +++ b/unittests/tools/test_gosec_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.gosec.parser import GosecParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestGosecParser(DojoTestCase): diff --git a/unittests/tools/test_h1_parser.py b/unittests/tools/test_h1_parser.py index d216c0498e..079404cd22 100644 --- a/unittests/tools/test_h1_parser.py +++ b/unittests/tools/test_h1_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.h1.parser import H1Parser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestHackerOneParser(DojoTestCase): diff --git a/unittests/tools/test_hadolint_parser.py b/unittests/tools/test_hadolint_parser.py index 48cafebb9d..d19ed046b7 100644 --- a/unittests/tools/test_hadolint_parser.py +++ b/unittests/tools/test_hadolint_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.hadolint.parser import HadolintParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TesthadolintParser(DojoTestCase): diff --git a/unittests/tools/test_harbor_vulnerability_parser.py b/unittests/tools/test_harbor_vulnerability_parser.py index 6a947d2d84..14994db1fd 100644 --- a/unittests/tools/test_harbor_vulnerability_parser.py +++ b/unittests/tools/test_harbor_vulnerability_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.harbor_vulnerability.parser import HarborVulnerabilityParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestHarborVulnerabilityParser(DojoTestCase): diff --git a/unittests/tools/test_hcl_appscan_parser.py b/unittests/tools/test_hcl_appscan_parser.py index ee33da0046..5539260fa7 100644 --- a/unittests/tools/test_hcl_appscan_parser.py +++ b/unittests/tools/test_hcl_appscan_parser.py @@ -1,6 +1,5 @@ from dojo.tools.hcl_appscan.parser import HCLAppScanParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestHCLAppScanParser(DojoTestCase): diff --git a/unittests/tools/test_horusec_parser.py b/unittests/tools/test_horusec_parser.py index 308738f779..5353acdd79 100644 --- a/unittests/tools/test_horusec_parser.py +++ b/unittests/tools/test_horusec_parser.py @@ -3,8 +3,7 @@ from dojo.models import Test from dojo.tools.horusec.parser import HorusecParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestHorusecParser(DojoTestCase): diff --git a/unittests/tools/test_huskyci_parser.py b/unittests/tools/test_huskyci_parser.py index 76aad5a15c..d0b76d7313 100644 --- a/unittests/tools/test_huskyci_parser.py +++ b/unittests/tools/test_huskyci_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.huskyci.parser import HuskyCIParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestHuskyCIParser(DojoTestCase): diff --git a/unittests/tools/test_ibm_app_parser.py b/unittests/tools/test_ibm_app_parser.py index 6755d294c0..cc58e1b014 100644 --- a/unittests/tools/test_ibm_app_parser.py +++ b/unittests/tools/test_ibm_app_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.ibm_app.parser import IbmAppParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestIbmAppParser(DojoTestCase): diff --git a/unittests/tools/test_immuniweb_parser.py b/unittests/tools/test_immuniweb_parser.py index ed79494c67..97de358c91 100644 --- a/unittests/tools/test_immuniweb_parser.py +++ b/unittests/tools/test_immuniweb_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.immuniweb.parser import ImmuniwebParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestImmuniwebParser(DojoTestCase): diff --git a/unittests/tools/test_intsights_parser.py b/unittests/tools/test_intsights_parser.py index 7afd0e33dd..79f367cfaf 100644 --- a/unittests/tools/test_intsights_parser.py +++ b/unittests/tools/test_intsights_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.intsights.parser import IntSightsParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestIntSightsParser(DojoTestCase): diff --git a/unittests/tools/test_jfrog_xray_api_summary_artifact_parser.py b/unittests/tools/test_jfrog_xray_api_summary_artifact_parser.py index d191ca7b43..615cad2595 100644 --- a/unittests/tools/test_jfrog_xray_api_summary_artifact_parser.py +++ b/unittests/tools/test_jfrog_xray_api_summary_artifact_parser.py @@ -4,8 +4,7 @@ from dojo.tools.jfrog_xray_api_summary_artifact.parser import ( JFrogXrayApiSummaryArtifactParser, ) - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestJFrogXrayApiSummaryArtifactParser(DojoTestCase): diff --git a/unittests/tools/test_jfrog_xray_on_demand_binary_scan_parser.py b/unittests/tools/test_jfrog_xray_on_demand_binary_scan_parser.py index 8109d7c48a..b88bc87d23 100644 --- a/unittests/tools/test_jfrog_xray_on_demand_binary_scan_parser.py +++ b/unittests/tools/test_jfrog_xray_on_demand_binary_scan_parser.py @@ -4,8 +4,7 @@ clean_title, get_component_name_version, ) - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestJFrogXrayOnDemandBinaryScanParser(DojoTestCase): diff --git a/unittests/tools/test_jfrog_xray_unified_parser.py b/unittests/tools/test_jfrog_xray_unified_parser.py index 9b8465e89a..914d3fb073 100644 --- a/unittests/tools/test_jfrog_xray_unified_parser.py +++ b/unittests/tools/test_jfrog_xray_unified_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.jfrog_xray_unified.parser import JFrogXrayUnifiedParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestJFrogXrayUnifiedParser(DojoTestCase): diff --git a/unittests/tools/test_jfrogxray_parser.py b/unittests/tools/test_jfrogxray_parser.py index d48742b9ff..267ebeed73 100644 --- a/unittests/tools/test_jfrogxray_parser.py +++ b/unittests/tools/test_jfrogxray_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.jfrogxray.parser import JFrogXrayParser, decode_cwe_number - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestJfrogJFrogXrayParser(DojoTestCase): diff --git a/unittests/tools/test_kics_parser.py b/unittests/tools/test_kics_parser.py index 3e814dc87f..9d3f064dcb 100644 --- a/unittests/tools/test_kics_parser.py +++ b/unittests/tools/test_kics_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.kics.parser import KICSParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestKICSParser(DojoTestCase): diff --git a/unittests/tools/test_kiuwan_parser.py b/unittests/tools/test_kiuwan_parser.py index 0d8a458719..f3c71124b4 100644 --- a/unittests/tools/test_kiuwan_parser.py +++ b/unittests/tools/test_kiuwan_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.kiuwan.parser import KiuwanParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestKiuwanParser(DojoTestCase): diff --git a/unittests/tools/test_kubeaudit_parser.py b/unittests/tools/test_kubeaudit_parser.py index 65b52378a2..1ec26a5729 100644 --- a/unittests/tools/test_kubeaudit_parser.py +++ b/unittests/tools/test_kubeaudit_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.kubeaudit.parser import KubeAuditParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestKubeAuditParser(DojoTestCase): diff --git a/unittests/tools/test_kubebench_parser.py b/unittests/tools/test_kubebench_parser.py index e0c7b6181a..601db2707d 100644 --- a/unittests/tools/test_kubebench_parser.py +++ b/unittests/tools/test_kubebench_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.kubebench.parser import KubeBenchParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestKubeBenchParser(DojoTestCase): diff --git a/unittests/tools/test_kubescape_parser.py b/unittests/tools/test_kubescape_parser.py index c68cb2f1f7..6437b705ef 100644 --- a/unittests/tools/test_kubescape_parser.py +++ b/unittests/tools/test_kubescape_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.kubescape.parser import KubescapeParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestKubescapeParser(DojoTestCase): diff --git a/unittests/tools/test_mend_parser.py b/unittests/tools/test_mend_parser.py index d30a35752a..8deaf6f2be 100644 --- a/unittests/tools/test_mend_parser.py +++ b/unittests/tools/test_mend_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.mend.parser import MendParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestMendParser(DojoTestCase): diff --git a/unittests/tools/test_meterian_parser.py b/unittests/tools/test_meterian_parser.py index 728c669020..d02b877aba 100644 --- a/unittests/tools/test_meterian_parser.py +++ b/unittests/tools/test_meterian_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.meterian.parser import MeterianParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestMeterianParser(DojoTestCase): diff --git a/unittests/tools/test_microfocus_webinspect_parser.py b/unittests/tools/test_microfocus_webinspect_parser.py index b44678cb4d..0d2dd131c1 100644 --- a/unittests/tools/test_microfocus_webinspect_parser.py +++ b/unittests/tools/test_microfocus_webinspect_parser.py @@ -1,7 +1,6 @@ from dojo.models import Engagement, Product, Test from dojo.tools.microfocus_webinspect.parser import MicrofocusWebinspectParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestMicrofocusWebinspectParser(DojoTestCase): diff --git a/unittests/tools/test_mobsf_parser.py b/unittests/tools/test_mobsf_parser.py index e5eb2a48e0..2cd4ed7363 100644 --- a/unittests/tools/test_mobsf_parser.py +++ b/unittests/tools/test_mobsf_parser.py @@ -1,7 +1,6 @@ from dojo.models import Engagement, Product, Test from dojo.tools.mobsf.parser import MobSFParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestMobSFParser(DojoTestCase): diff --git a/unittests/tools/test_mobsfscan_parser.py b/unittests/tools/test_mobsfscan_parser.py index 038bc09091..c0822bbf79 100644 --- a/unittests/tools/test_mobsfscan_parser.py +++ b/unittests/tools/test_mobsfscan_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.mobsfscan.parser import MobsfscanParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestMobsfscanParser(DojoTestCase): diff --git a/unittests/tools/test_mozilla_observatory_parser.py b/unittests/tools/test_mozilla_observatory_parser.py index 147eff5f2b..a84bc8c122 100644 --- a/unittests/tools/test_mozilla_observatory_parser.py +++ b/unittests/tools/test_mozilla_observatory_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.mozilla_observatory.parser import MozillaObservatoryParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestMozillaObservatoryParser(DojoTestCase): diff --git a/unittests/tools/test_ms_defender_parser.py b/unittests/tools/test_ms_defender_parser.py index 1f8f73ee3f..9d22621096 100644 --- a/unittests/tools/test_ms_defender_parser.py +++ b/unittests/tools/test_ms_defender_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.ms_defender.parser import MSDefenderParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestMSDefenderParser(DojoTestCase): diff --git a/unittests/tools/test_nancy_parser.py b/unittests/tools/test_nancy_parser.py index 5918f12ce9..39baa59297 100644 --- a/unittests/tools/test_nancy_parser.py +++ b/unittests/tools/test_nancy_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.nancy.parser import NancyParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestNancyParser(DojoTestCase): diff --git a/unittests/tools/test_netsparker_parser.py b/unittests/tools/test_netsparker_parser.py index c3c3f33604..0dbc95ff4b 100644 --- a/unittests/tools/test_netsparker_parser.py +++ b/unittests/tools/test_netsparker_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.netsparker.parser import NetsparkerParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestNetsparkerParser(DojoTestCase): diff --git a/unittests/tools/test_neuvector_compliance_parser.py b/unittests/tools/test_neuvector_compliance_parser.py index 0d41a19a99..30de36ea32 100644 --- a/unittests/tools/test_neuvector_compliance_parser.py +++ b/unittests/tools/test_neuvector_compliance_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.neuvector_compliance.parser import NeuVectorComplianceParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestNeuVectorComplianceParser(DojoTestCase): diff --git a/unittests/tools/test_neuvector_parser.py b/unittests/tools/test_neuvector_parser.py index ecb2faba98..c2bdd07af7 100644 --- a/unittests/tools/test_neuvector_parser.py +++ b/unittests/tools/test_neuvector_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.neuvector.parser import NeuVectorParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestNeuVectorParser(DojoTestCase): diff --git a/unittests/tools/test_nexpose_parser.py b/unittests/tools/test_nexpose_parser.py index 7b5afc112e..e53e90ce0e 100644 --- a/unittests/tools/test_nexpose_parser.py +++ b/unittests/tools/test_nexpose_parser.py @@ -4,8 +4,7 @@ from dojo.models import Engagement, Product, Test from dojo.tools.nexpose.parser import NexposeParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestNexposeParser(DojoTestCase): diff --git a/unittests/tools/test_nikto_parser.py b/unittests/tools/test_nikto_parser.py index 9524fab549..290a3a8a37 100644 --- a/unittests/tools/test_nikto_parser.py +++ b/unittests/tools/test_nikto_parser.py @@ -1,7 +1,6 @@ from dojo.models import Engagement, Product, Test from dojo.tools.nikto.parser import NiktoParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestNiktoParser(DojoTestCase): diff --git a/unittests/tools/test_nmap_parser.py b/unittests/tools/test_nmap_parser.py index a78474d89a..fa5efd00f8 100644 --- a/unittests/tools/test_nmap_parser.py +++ b/unittests/tools/test_nmap_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.nmap.parser import NmapParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestNmapParser(DojoTestCase): diff --git a/unittests/tools/test_npm_audit_7_plus_parser.py b/unittests/tools/test_npm_audit_7_plus_parser.py index 1c3c888edf..e551c5d77b 100644 --- a/unittests/tools/test_npm_audit_7_plus_parser.py +++ b/unittests/tools/test_npm_audit_7_plus_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.npm_audit_7_plus.parser import NpmAudit7PlusParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestNpmAudit7PlusParser(DojoTestCase): diff --git a/unittests/tools/test_npm_audit_parser.py b/unittests/tools/test_npm_audit_parser.py index fac2473b51..0793f0cfd4 100644 --- a/unittests/tools/test_npm_audit_parser.py +++ b/unittests/tools/test_npm_audit_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.npm_audit.parser import NpmAuditParser, censor_path_hashes - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestNpmAuditParser(DojoTestCase): diff --git a/unittests/tools/test_nsp_parser.py b/unittests/tools/test_nsp_parser.py index 0901681343..571adb41cd 100644 --- a/unittests/tools/test_nsp_parser.py +++ b/unittests/tools/test_nsp_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.nsp.parser import NspParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestNspParser(DojoTestCase): diff --git a/unittests/tools/test_nuclei_parser.py b/unittests/tools/test_nuclei_parser.py index 2ffde1fb02..131694523e 100644 --- a/unittests/tools/test_nuclei_parser.py +++ b/unittests/tools/test_nuclei_parser.py @@ -4,8 +4,7 @@ from dojo.models import Test from dojo.tools.nuclei.parser import NucleiParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestNucleiParser(DojoTestCase): diff --git a/unittests/tools/test_openscap_parser.py b/unittests/tools/test_openscap_parser.py index 5e765b6986..2fd718a1ee 100644 --- a/unittests/tools/test_openscap_parser.py +++ b/unittests/tools/test_openscap_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.openscap.parser import OpenscapParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestOpenscapParser(DojoTestCase): diff --git a/unittests/tools/test_openvas_parser.py b/unittests/tools/test_openvas_parser.py index edefaac12f..d7906896e3 100644 --- a/unittests/tools/test_openvas_parser.py +++ b/unittests/tools/test_openvas_parser.py @@ -1,7 +1,6 @@ from dojo.models import Engagement, Product, Test from dojo.tools.openvas.parser import OpenVASParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestOpenVASParser(DojoTestCase): diff --git a/unittests/tools/test_ort_parser.py b/unittests/tools/test_ort_parser.py index 823c611774..f523d35626 100644 --- a/unittests/tools/test_ort_parser.py +++ b/unittests/tools/test_ort_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.ort.parser import OrtParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestOrtParser(DojoTestCase): diff --git a/unittests/tools/test_ossindex_devaudit_parser.py b/unittests/tools/test_ossindex_devaudit_parser.py index e6eb38f4de..e617654a20 100644 --- a/unittests/tools/test_ossindex_devaudit_parser.py +++ b/unittests/tools/test_ossindex_devaudit_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.ossindex_devaudit.parser import OssIndexDevauditParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestOssIndexDevauditParser(DojoTestCase): diff --git a/unittests/tools/test_osv_scanner_parser.py b/unittests/tools/test_osv_scanner_parser.py index 46ba8077dd..794d429bd0 100644 --- a/unittests/tools/test_osv_scanner_parser.py +++ b/unittests/tools/test_osv_scanner_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.osv_scanner.parser import OSVScannerParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestOSVScannerParser(DojoTestCase): diff --git a/unittests/tools/test_outpost24_parser.py b/unittests/tools/test_outpost24_parser.py index 1e8ca61b91..39e44d8220 100644 --- a/unittests/tools/test_outpost24_parser.py +++ b/unittests/tools/test_outpost24_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.outpost24.parser import Outpost24Parser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestOutpost24Parser(DojoTestCase): diff --git a/unittests/tools/test_php_security_audit_v2_parser.py b/unittests/tools/test_php_security_audit_v2_parser.py index e684fabcc9..c8d4fd2091 100644 --- a/unittests/tools/test_php_security_audit_v2_parser.py +++ b/unittests/tools/test_php_security_audit_v2_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.php_security_audit_v2.parser import PhpSecurityAuditV2Parser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestPhpSecurityAuditV2ParserParser(DojoTestCase): diff --git a/unittests/tools/test_php_symfony_security_check_parser.py b/unittests/tools/test_php_symfony_security_check_parser.py index b191038d98..6566c02ebe 100644 --- a/unittests/tools/test_php_symfony_security_check_parser.py +++ b/unittests/tools/test_php_symfony_security_check_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.php_symfony_security_check.parser import PhpSymfonySecurityCheckParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestPhpSymfonySecurityCheckerParser(DojoTestCase): diff --git a/unittests/tools/test_pip_audit_parser.py b/unittests/tools/test_pip_audit_parser.py index 2f765ca9c3..679fe10590 100644 --- a/unittests/tools/test_pip_audit_parser.py +++ b/unittests/tools/test_pip_audit_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.pip_audit.parser import PipAuditParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestPipAuditParser(DojoTestCase): diff --git a/unittests/tools/test_pmd_parser.py b/unittests/tools/test_pmd_parser.py index e876d2c700..9a23238402 100644 --- a/unittests/tools/test_pmd_parser.py +++ b/unittests/tools/test_pmd_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.pmd.parser import PmdParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestPMDParser(DojoTestCase): diff --git a/unittests/tools/test_popeye_parser.py b/unittests/tools/test_popeye_parser.py index ee029855df..04a553679b 100644 --- a/unittests/tools/test_popeye_parser.py +++ b/unittests/tools/test_popeye_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.popeye.parser import PopeyeParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestPopeyeParser(DojoTestCase): diff --git a/unittests/tools/test_progpilot_parser.py b/unittests/tools/test_progpilot_parser.py index 0cfbaf1804..b1f6557b20 100644 --- a/unittests/tools/test_progpilot_parser.py +++ b/unittests/tools/test_progpilot_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.progpilot.parser import ProgpilotParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestProgpilotParser(DojoTestCase): diff --git a/unittests/tools/test_pwn_sast_parser.py b/unittests/tools/test_pwn_sast_parser.py index e24bdaaca3..140aa761c3 100644 --- a/unittests/tools/test_pwn_sast_parser.py +++ b/unittests/tools/test_pwn_sast_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.pwn_sast.parser import PWNSASTParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestPWNSASTParser(DojoTestCase): diff --git a/unittests/tools/test_qualys_infrascan_webgui_parser.py b/unittests/tools/test_qualys_infrascan_webgui_parser.py index 9605e814c3..78e57188a6 100644 --- a/unittests/tools/test_qualys_infrascan_webgui_parser.py +++ b/unittests/tools/test_qualys_infrascan_webgui_parser.py @@ -4,8 +4,7 @@ from dojo.models import Test from dojo.tools.qualys_infrascan_webgui.parser import QualysInfrascanWebguiParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestQualysInfrascanWebguiParser(DojoTestCase): diff --git a/unittests/tools/test_qualys_parser.py b/unittests/tools/test_qualys_parser.py index a1317eaf49..075b9d4a3b 100644 --- a/unittests/tools/test_qualys_parser.py +++ b/unittests/tools/test_qualys_parser.py @@ -4,8 +4,7 @@ from dojo.models import Test from dojo.tools.qualys.parser import QualysParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestQualysParser(DojoTestCase): diff --git a/unittests/tools/test_qualys_webapp_parser.py b/unittests/tools/test_qualys_webapp_parser.py index 456b8f5a80..2df655e36b 100644 --- a/unittests/tools/test_qualys_webapp_parser.py +++ b/unittests/tools/test_qualys_webapp_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.qualys_webapp.parser import QualysWebAppParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestQualysWebAppParser(DojoTestCase): diff --git a/unittests/tools/test_redhatsatellite_parser.py b/unittests/tools/test_redhatsatellite_parser.py index da1175a8df..bfaabbd326 100644 --- a/unittests/tools/test_redhatsatellite_parser.py +++ b/unittests/tools/test_redhatsatellite_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.redhatsatellite.parser import RedHatSatelliteParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestRedHatSatelliteParser(DojoTestCase): diff --git a/unittests/tools/test_retirejs_parser.py b/unittests/tools/test_retirejs_parser.py index 2802d3667a..d26c8af1c1 100644 --- a/unittests/tools/test_retirejs_parser.py +++ b/unittests/tools/test_retirejs_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.retirejs.parser import RetireJsParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestRetireJsParser(DojoTestCase): diff --git a/unittests/tools/test_risk_recon_parser.py b/unittests/tools/test_risk_recon_parser.py index 839c6cf80d..dde31a77ca 100644 --- a/unittests/tools/test_risk_recon_parser.py +++ b/unittests/tools/test_risk_recon_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.risk_recon.parser import RiskReconParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestRiskReconAPIParser(DojoTestCase): diff --git a/unittests/tools/test_rubocop_parser.py b/unittests/tools/test_rubocop_parser.py index 1dba608f01..e581366ba6 100644 --- a/unittests/tools/test_rubocop_parser.py +++ b/unittests/tools/test_rubocop_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.rubocop.parser import RubocopParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestRubocopParser(DojoTestCase): diff --git a/unittests/tools/test_rusty_hog_parser.py b/unittests/tools/test_rusty_hog_parser.py index 472e15b822..b9aca9a65c 100644 --- a/unittests/tools/test_rusty_hog_parser.py +++ b/unittests/tools/test_rusty_hog_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.rusty_hog.parser import RustyhogParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestRustyhogParser(DojoTestCase): diff --git a/unittests/tools/test_sarif_parser.py b/unittests/tools/test_sarif_parser.py index a3443e51bc..eb3dd05332 100644 --- a/unittests/tools/test_sarif_parser.py +++ b/unittests/tools/test_sarif_parser.py @@ -3,8 +3,7 @@ from dojo.models import Finding, Test from dojo.tools.sarif.parser import SarifParser, get_fingerprints_hashes - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestSarifParser(DojoTestCase): diff --git a/unittests/tools/test_scantist_parser.py b/unittests/tools/test_scantist_parser.py index befdf404c8..7b8e0b0d4c 100644 --- a/unittests/tools/test_scantist_parser.py +++ b/unittests/tools/test_scantist_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.scantist.parser import ScantistParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestScantistParser(DojoTestCase): diff --git a/unittests/tools/test_scout_suite_parser.py b/unittests/tools/test_scout_suite_parser.py index 40e6761f84..1cab703c17 100644 --- a/unittests/tools/test_scout_suite_parser.py +++ b/unittests/tools/test_scout_suite_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.scout_suite.parser import ScoutSuiteParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestScoutSuiteParser(DojoTestCase): diff --git a/unittests/tools/test_semgrep_parser.py b/unittests/tools/test_semgrep_parser.py index 27a6d1b755..f2f329a15a 100644 --- a/unittests/tools/test_semgrep_parser.py +++ b/unittests/tools/test_semgrep_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.semgrep.parser import SemgrepParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestSemgrepParser(DojoTestCase): diff --git a/unittests/tools/test_skf_parser.py b/unittests/tools/test_skf_parser.py index b39ac83257..f0f197abe5 100644 --- a/unittests/tools/test_skf_parser.py +++ b/unittests/tools/test_skf_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.skf.parser import SKFParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestSkfParser(DojoTestCase): diff --git a/unittests/tools/test_snyk_code_parser.py b/unittests/tools/test_snyk_code_parser.py index 37524acefa..20d3109e1e 100644 --- a/unittests/tools/test_snyk_code_parser.py +++ b/unittests/tools/test_snyk_code_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.snyk_code.parser import SnykCodeParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestSnykCodeParser(DojoTestCase): diff --git a/unittests/tools/test_snyk_parser.py b/unittests/tools/test_snyk_parser.py index d79dc0db0d..59fde5a85f 100644 --- a/unittests/tools/test_snyk_parser.py +++ b/unittests/tools/test_snyk_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.snyk.parser import SnykParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestSnykParser(DojoTestCase): diff --git a/unittests/tools/test_solar_appscreener_parser.py b/unittests/tools/test_solar_appscreener_parser.py index 1d4c38c7c0..3e2284ee80 100644 --- a/unittests/tools/test_solar_appscreener_parser.py +++ b/unittests/tools/test_solar_appscreener_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.solar_appscreener.parser import SolarAppscreenerParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestSolarAppscreenerParser(DojoTestCase): diff --git a/unittests/tools/test_sonarqube_parser.py b/unittests/tools/test_sonarqube_parser.py index 95c1d3532c..cf72d020e5 100644 --- a/unittests/tools/test_sonarqube_parser.py +++ b/unittests/tools/test_sonarqube_parser.py @@ -1,7 +1,6 @@ from dojo.models import Engagement, Product, Test from dojo.tools.sonarqube.parser import SonarQubeParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestSonarQubeParser(DojoTestCase): diff --git a/unittests/tools/test_sonatype_parser.py b/unittests/tools/test_sonatype_parser.py index 6bf57e041c..232f4dfec0 100644 --- a/unittests/tools/test_sonatype_parser.py +++ b/unittests/tools/test_sonatype_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.sonatype.parser import SonatypeParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestSonatypeParser(DojoTestCase): diff --git a/unittests/tools/test_spotbugs_parser.py b/unittests/tools/test_spotbugs_parser.py index b105ebb20a..879c971312 100644 --- a/unittests/tools/test_spotbugs_parser.py +++ b/unittests/tools/test_spotbugs_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.spotbugs.parser import SpotbugsParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestSpotbugsParser(DojoTestCase): diff --git a/unittests/tools/test_ssh_audit_parser.py b/unittests/tools/test_ssh_audit_parser.py index a29d36c1a9..e189ea81e7 100644 --- a/unittests/tools/test_ssh_audit_parser.py +++ b/unittests/tools/test_ssh_audit_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.ssh_audit.parser import SSHAuditParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestSSHAuditParser(DojoTestCase): diff --git a/unittests/tools/test_ssl_labs_parser.py b/unittests/tools/test_ssl_labs_parser.py index b28d647dd7..125965ea13 100644 --- a/unittests/tools/test_ssl_labs_parser.py +++ b/unittests/tools/test_ssl_labs_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.ssl_labs.parser import SslLabsParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestSslLabsParser(DojoTestCase): diff --git a/unittests/tools/test_sslscan_parser.py b/unittests/tools/test_sslscan_parser.py index b685178247..157046e3e1 100644 --- a/unittests/tools/test_sslscan_parser.py +++ b/unittests/tools/test_sslscan_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.sslscan.parser import SslscanParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestSslscanParser(DojoTestCase): diff --git a/unittests/tools/test_sslyze_parser.py b/unittests/tools/test_sslyze_parser.py index 4493d4d180..0e961f4531 100644 --- a/unittests/tools/test_sslyze_parser.py +++ b/unittests/tools/test_sslyze_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.sslyze.parser import SslyzeParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestSslyzeJSONParser(DojoTestCase): diff --git a/unittests/tools/test_talisman_parser.py b/unittests/tools/test_talisman_parser.py index 89221d212b..0f05b83d71 100644 --- a/unittests/tools/test_talisman_parser.py +++ b/unittests/tools/test_talisman_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.talisman.parser import TalismanParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestTalismanParser(DojoTestCase): diff --git a/unittests/tools/test_tenable_parser.py b/unittests/tools/test_tenable_parser.py index c8468e3222..29922a3f64 100644 --- a/unittests/tools/test_tenable_parser.py +++ b/unittests/tools/test_tenable_parser.py @@ -2,8 +2,7 @@ from dojo.models import Engagement, Finding, Product, Test from dojo.tools.tenable.parser import TenableParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestTenableParser(DojoTestCase): diff --git a/unittests/tools/test_terrascan_parser.py b/unittests/tools/test_terrascan_parser.py index 4fa717fccd..8201b65c31 100644 --- a/unittests/tools/test_terrascan_parser.py +++ b/unittests/tools/test_terrascan_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.terrascan.parser import TerrascanParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestTerrascanParser(DojoTestCase): diff --git a/unittests/tools/test_testssl_parser.py b/unittests/tools/test_testssl_parser.py index 785c1b51f7..deae821733 100644 --- a/unittests/tools/test_testssl_parser.py +++ b/unittests/tools/test_testssl_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.testssl.parser import TestsslParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestTestsslParser(DojoTestCase): diff --git a/unittests/tools/test_tfsec_parser.py b/unittests/tools/test_tfsec_parser.py index f3974c20d0..23a88fd895 100644 --- a/unittests/tools/test_tfsec_parser.py +++ b/unittests/tools/test_tfsec_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.tfsec.parser import TFSecParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestTFSecParser(DojoTestCase): diff --git a/unittests/tools/test_trivy_operator_parser.py b/unittests/tools/test_trivy_operator_parser.py index 705a9bae29..a5a52f1ded 100644 --- a/unittests/tools/test_trivy_operator_parser.py +++ b/unittests/tools/test_trivy_operator_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.trivy_operator.parser import TrivyOperatorParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path def sample_path(file_name): diff --git a/unittests/tools/test_trivy_parser.py b/unittests/tools/test_trivy_parser.py index 6e53d9b756..e61cd70cd8 100644 --- a/unittests/tools/test_trivy_parser.py +++ b/unittests/tools/test_trivy_parser.py @@ -3,8 +3,7 @@ from dojo.models import Test from dojo.tools.trivy.parser import TrivyParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path def sample_path(file_name): diff --git a/unittests/tools/test_trufflehog3_parser.py b/unittests/tools/test_trufflehog3_parser.py index 25215ada85..1b24c35e2b 100644 --- a/unittests/tools/test_trufflehog3_parser.py +++ b/unittests/tools/test_trufflehog3_parser.py @@ -3,8 +3,7 @@ from dojo.models import Test from dojo.tools.trufflehog3.parser import TruffleHog3Parser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path def sample_path(file_name): diff --git a/unittests/tools/test_trufflehog_parser.py b/unittests/tools/test_trufflehog_parser.py index a3820ab458..11aa8b55a3 100644 --- a/unittests/tools/test_trufflehog_parser.py +++ b/unittests/tools/test_trufflehog_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.trufflehog.parser import TruffleHogParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path def sample_path(file_name): diff --git a/unittests/tools/test_trustwave_fusion_api_parser.py b/unittests/tools/test_trustwave_fusion_api_parser.py index f09272e445..7773af5cb2 100644 --- a/unittests/tools/test_trustwave_fusion_api_parser.py +++ b/unittests/tools/test_trustwave_fusion_api_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.trustwave_fusion_api.parser import TrustwaveFusionAPIParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestTrustwaveFusionAPIParser(DojoTestCase): diff --git a/unittests/tools/test_trustwave_parser.py b/unittests/tools/test_trustwave_parser.py index 328213743b..b0931d980b 100644 --- a/unittests/tools/test_trustwave_parser.py +++ b/unittests/tools/test_trustwave_parser.py @@ -2,8 +2,7 @@ from dojo.models import Engagement, Product, Test from dojo.tools.trustwave.parser import TrustwaveParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path def sample_path(file_name): diff --git a/unittests/tools/test_twistlock_parser.py b/unittests/tools/test_twistlock_parser.py index e972b0700f..8d8121305b 100644 --- a/unittests/tools/test_twistlock_parser.py +++ b/unittests/tools/test_twistlock_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.twistlock.parser import TwistlockParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestTwistlockParser(DojoTestCase): diff --git a/unittests/tools/test_vcg_parser.py b/unittests/tools/test_vcg_parser.py index 59c5a7bc1e..3900a7ad04 100644 --- a/unittests/tools/test_vcg_parser.py +++ b/unittests/tools/test_vcg_parser.py @@ -5,8 +5,7 @@ from dojo.models import Test from dojo.tools.vcg.parser import VCGCsvParser, VCGParser, VCGXmlParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestFile: diff --git a/unittests/tools/test_veracode_parser.py b/unittests/tools/test_veracode_parser.py index 1149daddba..9a00b0d646 100644 --- a/unittests/tools/test_veracode_parser.py +++ b/unittests/tools/test_veracode_parser.py @@ -4,8 +4,7 @@ from dojo.models import Endpoint, Engagement, Product, Product_Type, Test from dojo.tools.veracode.parser import VeracodeParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestVeracodeScannerParser(DojoTestCase): diff --git a/unittests/tools/test_veracode_sca_parser.py b/unittests/tools/test_veracode_sca_parser.py index fdcfa0b60f..03c70e50a1 100644 --- a/unittests/tools/test_veracode_sca_parser.py +++ b/unittests/tools/test_veracode_sca_parser.py @@ -5,8 +5,7 @@ from dojo.models import Test from dojo.tools.veracode_sca.parser import VeracodeScaParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestVeracodeScaScannerParser(DojoTestCase): diff --git a/unittests/tools/test_wapiti_parser.py b/unittests/tools/test_wapiti_parser.py index 3b5bc74235..fa7dd8592a 100644 --- a/unittests/tools/test_wapiti_parser.py +++ b/unittests/tools/test_wapiti_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.wapiti.parser import WapitiParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestWapitiParser(DojoTestCase): diff --git a/unittests/tools/test_wazuh_parser.py b/unittests/tools/test_wazuh_parser.py index 1e881e1d02..ec48ac6335 100644 --- a/unittests/tools/test_wazuh_parser.py +++ b/unittests/tools/test_wazuh_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.wazuh.parser import WazuhParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestWazuhParser(DojoTestCase): diff --git a/unittests/tools/test_wfuzz_parser.py b/unittests/tools/test_wfuzz_parser.py index e9f1e69411..ce140a9c11 100644 --- a/unittests/tools/test_wfuzz_parser.py +++ b/unittests/tools/test_wfuzz_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.wfuzz.parser import WFuzzParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestWFuzzParser(DojoTestCase): diff --git a/unittests/tools/test_whitehat_sentinel_parser.py b/unittests/tools/test_whitehat_sentinel_parser.py index 65e91fc23b..9e957333e0 100644 --- a/unittests/tools/test_whitehat_sentinel_parser.py +++ b/unittests/tools/test_whitehat_sentinel_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.whitehat_sentinel.parser import WhiteHatSentinelParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestWhiteHatSentinelParser(DojoTestCase): diff --git a/unittests/tools/test_wiz_parser.py b/unittests/tools/test_wiz_parser.py index 040d7791e1..38a350318c 100644 --- a/unittests/tools/test_wiz_parser.py +++ b/unittests/tools/test_wiz_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.wiz.parser import WizParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestWizParser(DojoTestCase): diff --git a/unittests/tools/test_wpscan_parser.py b/unittests/tools/test_wpscan_parser.py index c3932ebe75..1e70aa4e51 100644 --- a/unittests/tools/test_wpscan_parser.py +++ b/unittests/tools/test_wpscan_parser.py @@ -2,8 +2,7 @@ from dojo.models import Test from dojo.tools.wpscan.parser import WpscanParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestWpscanParser(DojoTestCase): diff --git a/unittests/tools/test_xanitizer_parser.py b/unittests/tools/test_xanitizer_parser.py index 8b46a61dea..0b27b985a5 100644 --- a/unittests/tools/test_xanitizer_parser.py +++ b/unittests/tools/test_xanitizer_parser.py @@ -1,7 +1,6 @@ from dojo.models import Test from dojo.tools.xanitizer.parser import XanitizerParser - -from ..dojo_test_case import DojoTestCase, get_unit_tests_path +from unittests.dojo_test_case import DojoTestCase, get_unit_tests_path class TestXanitizerParser(DojoTestCase): diff --git a/unittests/tools/test_yarn_audit_parser.py b/unittests/tools/test_yarn_audit_parser.py index 2a43e6222a..1206f88b43 100644 --- a/unittests/tools/test_yarn_audit_parser.py +++ b/unittests/tools/test_yarn_audit_parser.py @@ -1,7 +1,6 @@ from dojo.models import Engagement, Product, Test from dojo.tools.yarn_audit.parser import YarnAuditParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestYarnAuditParser(DojoTestCase): diff --git a/unittests/tools/test_zap_parser.py b/unittests/tools/test_zap_parser.py index c7b738155c..325e920598 100644 --- a/unittests/tools/test_zap_parser.py +++ b/unittests/tools/test_zap_parser.py @@ -1,7 +1,6 @@ from dojo.models import Finding, Test from dojo.tools.zap.parser import ZapParser - -from ..dojo_test_case import DojoTestCase +from unittests.dojo_test_case import DojoTestCase class TestZapParser(DojoTestCase): From 36d6700cd2b3d74741e1eef06fd23c2359a92cf2 Mon Sep 17 00:00:00 2001 From: kiblik <5609770+kiblik@users.noreply.github.com> Date: Tue, 2 Jul 2024 04:24:45 +0200 Subject: [PATCH 010/111] Ruff: add and fix PIE (#10090) --- dojo/endpoint/utils.py | 2 +- dojo/engagement/views.py | 5 ----- dojo/filters.py | 10 ---------- dojo/importers/base_importer.py | 1 - dojo/importers/options.py | 1 - dojo/jira_link/helper.py | 1 - dojo/models.py | 2 -- dojo/notifications/helper.py | 1 - dojo/okta.py | 1 - dojo/product/views.py | 3 +-- dojo/templatetags/display_tags.py | 2 +- dojo/tools/burp_enterprise/parser.py | 4 ++-- dojo/tools/jfrog_xray_unified/parser.py | 2 +- dojo/tools/qualys_webapp/parser.py | 4 ++-- dojo/tools/veracode/json_parser.py | 2 +- dojo/tools/veracode_sca/parser.py | 6 +++--- dojo/tools/xanitizer/parser.py | 1 - dojo/utils.py | 3 +-- ruff.toml | 1 + tests/close_old_findings_dedupe_test.py | 2 +- tests/dedupe_test.py | 2 +- 21 files changed, 16 insertions(+), 40 deletions(-) diff --git a/dojo/endpoint/utils.py b/dojo/endpoint/utils.py index dea5db9e07..e40de5c5e1 100644 --- a/dojo/endpoint/utils.py +++ b/dojo/endpoint/utils.py @@ -93,7 +93,7 @@ def endpoint_get_or_create(**kwargs): def clean_hosts_run(apps, change): def err_log(message, html_log, endpoint_html_log, endpoint): error_suffix = 'It is not possible to migrate it. Delete or edit this endpoint.' - html_log.append({**endpoint_html_log, **{'message': message}}) + html_log.append({**endpoint_html_log, 'message': message}) logger.error(f'Endpoint (id={endpoint.pk}) {message}. {error_suffix}') broken_endpoints.add(endpoint.pk) html_log = [] diff --git a/dojo/engagement/views.py b/dojo/engagement/views.py index f0c542e2d9..2fdc7e34a4 100644 --- a/dojo/engagement/views.py +++ b/dojo/engagement/views.py @@ -459,7 +459,6 @@ def get(self, request, eid, *args, **kwargs): check = Check_List.objects.get(engagement=eng) except: check = None - pass notes = eng.notes.all() note_type_activation = Note_Type.objects.filter(is_active=True).count() if note_type_activation: @@ -531,7 +530,6 @@ def post(self, request, eid, *args, **kwargs): check = Check_List.objects.get(engagement=eng) except: check = None - pass notes = eng.notes.all() note_type_activation = Note_Type.objects.filter(is_active=True).count() if note_type_activation: @@ -636,7 +634,6 @@ def add_tests(request, eid): new_test.lead = User.objects.get(id=form['lead'].value()) except: new_test.lead = None - pass # Set status to in progress if a test is added if eng.status != "In Progress" and eng.active is True: @@ -1152,7 +1149,6 @@ def complete_checklist(request, eid): checklist = Check_List.objects.get(engagement=eng) except: checklist = None - pass add_breadcrumb( parent=eng, @@ -1174,7 +1170,6 @@ def complete_checklist(request, eid): cl.engagement = eng cl.save() form.save_m2m() - pass messages.add_message( request, messages.SUCCESS, diff --git a/dojo/filters.py b/dojo/filters.py index 9d3a94a43d..5eeced2f11 100644 --- a/dojo/filters.py +++ b/dojo/filters.py @@ -1999,14 +1999,6 @@ class Meta: exclude = ['description', 'mitigation', 'impact', 'references', 'numerical_severity'] - not_tags = ModelMultipleChoiceFilter( - field_name='tags__name', - to_field_name='name', - exclude=True, - queryset=Finding.tags.tag_model.objects.all().order_by('name'), - # label='tags', # doesn't work with tagulous, need to set in __init__ below - ) - not_test__tags = ModelMultipleChoiceFilter( field_name='test__tags__name', to_field_name='name', @@ -2034,8 +2026,6 @@ class Meta: # label='tags', # doesn't work with tagulous, need to set in __init__ below ) - not_tag = CharFilter(field_name='tags__name', lookup_expr='icontains', label='Not tag name contains', exclude=True) - def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.form.fields['cwe'].choices = cwe_options(self.queryset) diff --git a/dojo/importers/base_importer.py b/dojo/importers/base_importer.py index b2ff46e8f1..9eee547b9c 100644 --- a/dojo/importers/base_importer.py +++ b/dojo/importers/base_importer.py @@ -49,7 +49,6 @@ def get_findings(scan_type: str, test: Test) -> List[Finding]: TODO This should be enforced in the future, but here is not the place TODO once this enforced, this stub class should be removed """ - pass class BaseImporter(ImporterOptions): diff --git a/dojo/importers/options.py b/dojo/importers/options.py index 52b291ecaf..5ae687085a 100644 --- a/dojo/importers/options.py +++ b/dojo/importers/options.py @@ -83,7 +83,6 @@ def load_additional_options( An added hook for loading additional options to be used by children classes for the BaseImporter """ - pass def log_translation( self, diff --git a/dojo/jira_link/helper.py b/dojo/jira_link/helper.py index 0273e0a746..32329431d7 100644 --- a/dojo/jira_link/helper.py +++ b/dojo/jira_link/helper.py @@ -1540,7 +1540,6 @@ def process_jira_project_form(request, instance=None, target=None, product=None, except Exception as e: error = True logger.exception(e) - pass else: logger.debug(jform.errors) error = True diff --git a/dojo/models.py b/dojo/models.py index 5de06d4274..040ffbe3dd 100644 --- a/dojo/models.py +++ b/dojo/models.py @@ -3055,7 +3055,6 @@ def github_conf(self): github_conf = github_product_key.conf except: github_conf = None - pass return github_conf # newer version that can work with prefetching @@ -3064,7 +3063,6 @@ def github_conf_new(self): return self.test.engagement.product.github_pkey_set.all()[0].git_conf except: return None - pass @property def has_jira_issue(self): diff --git a/dojo/notifications/helper.py b/dojo/notifications/helper.py index c89d185554..0afb0d6b36 100644 --- a/dojo/notifications/helper.py +++ b/dojo/notifications/helper.py @@ -270,7 +270,6 @@ def send_msteams_notification(event, user=None, *args, **kwargs): except Exception as e: logger.exception(e) log_alert(e, "Microsoft Teams Notification", title=kwargs['title'], description=str(e), url=kwargs['url']) - pass @dojo_async_task diff --git a/dojo/okta.py b/dojo/okta.py index 47fa718de6..68934e1d5e 100644 --- a/dojo/okta.py +++ b/dojo/okta.py @@ -88,7 +88,6 @@ def validate_and_return_id_token(self, id_token, access_token): except JWTError: if k is None and client_id == 'a-key': k = self.get_jwks_keys()[0] - pass claims = jwt.decode( id_token, diff --git a/dojo/product/views.py b/dojo/product/views.py index 9a70751ae1..47d984c833 100644 --- a/dojo/product/views.py +++ b/dojo/product/views.py @@ -226,7 +226,7 @@ def view_product(request, pid): benchmark_type__enabled=True).order_by('benchmark_type__name') sla = SLA_Configuration.objects.filter(id=prod.sla_configuration_id).first() benchAndPercent = [] - for i in range(0, len(benchmarks)): + for i in range(len(benchmarks)): desired_level, total, total_pass, total_wait, total_fail, _total_viewed = asvs_calc_level(benchmarks[i]) success_percent = round((float(total_pass) / float(total)) * 100, 2) @@ -939,7 +939,6 @@ def edit_product(request, pid): github_inst = GITHUB_PKey.objects.get(product=product) except: github_inst = None - pass if request.method == 'POST': form = ProductForm(request.POST, instance=product) diff --git a/dojo/templatetags/display_tags.py b/dojo/templatetags/display_tags.py index ed224d1b70..d7df4559bd 100644 --- a/dojo/templatetags/display_tags.py +++ b/dojo/templatetags/display_tags.py @@ -484,7 +484,7 @@ def not_specified_icon(tooltip): def stars(filled, total, tooltip): code = '' - for i in range(0, total): + for i in range(total): if i < filled: code += '