-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace hardcoded package version with DEFAULT_VERSION in unittests
- Loading branch information
1 parent
3b6ba4c
commit 0a2a447
Showing
3 changed files
with
53 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,6 +49,7 @@ | |
DEFAULT_SCAP_DATA_PATH, | ||
DEFAULT_SCAP_DATA_URL_PATH, | ||
DEFAULT_USER_CONFIG_FILE, | ||
DEFAULT_VERSION, | ||
) | ||
from greenbone.feed.sync.errors import ConfigFileError | ||
from greenbone.feed.sync.helper import DEFAULT_FLOCK_WAIT_INTERVAL | ||
|
@@ -742,35 +743,35 @@ def test_feed_url_from_enterprise_feed_key(self): | |
) | ||
self.assertEqual( | ||
args.gvmd_data_url, | ||
"ssh://[email protected]/enterprise/data-feed/22.04/", | ||
f"ssh://[email protected]/enterprise/data-feed/{DEFAULT_VERSION}/", | ||
) | ||
self.assertEqual( | ||
args.port_lists_url, | ||
"ssh://[email protected]/enterprise/data-feed/22.04/port-lists/", | ||
f"ssh://[email protected]/enterprise/data-feed/{DEFAULT_VERSION}/port-lists/", | ||
) | ||
self.assertEqual( | ||
args.report_formats_url, | ||
"ssh://[email protected]/enterprise/data-feed/22.04/report-formats/", | ||
f"ssh://[email protected]/enterprise/data-feed/{DEFAULT_VERSION}/report-formats/", | ||
) | ||
self.assertEqual( | ||
args.scan_configs_url, | ||
"ssh://[email protected]/enterprise/data-feed/22.04/scan-configs/", | ||
f"ssh://[email protected]/enterprise/data-feed/{DEFAULT_VERSION}/scan-configs/", | ||
) | ||
self.assertEqual( | ||
args.notus_url, | ||
"ssh://[email protected]/enterprise/vulnerability-feed/22.04/vt-data/notus/", | ||
f"ssh://[email protected]/enterprise/vulnerability-feed/{DEFAULT_VERSION}/vt-data/notus/", | ||
) | ||
self.assertEqual( | ||
args.nasl_url, | ||
"ssh://[email protected]/enterprise/vulnerability-feed/22.04/vt-data/nasl/", | ||
f"ssh://[email protected]/enterprise/vulnerability-feed/{DEFAULT_VERSION}/vt-data/nasl/", | ||
) | ||
self.assertEqual( | ||
args.scap_data_url, | ||
"ssh://[email protected]/enterprise/vulnerability-feed/22.04/scap-data/", | ||
f"ssh://[email protected]/enterprise/vulnerability-feed/{DEFAULT_VERSION}/scap-data/", | ||
) | ||
self.assertEqual( | ||
args.cert_data_url, | ||
"ssh://[email protected]/enterprise/vulnerability-feed/22.04/cert-data/", | ||
f"ssh://[email protected]/enterprise/vulnerability-feed/{DEFAULT_VERSION}/cert-data/", | ||
) | ||
|
||
def test_ignore_non_existing_enterprise_feed_key(self): | ||
|
@@ -784,35 +785,35 @@ def test_ignore_non_existing_enterprise_feed_key(self): | |
) | ||
self.assertEqual( | ||
args.gvmd_data_url, | ||
"rsync://feed.community.greenbone.net/community/data-feed/22.04/", | ||
f"rsync://feed.community.greenbone.net/community/data-feed/{DEFAULT_VERSION}/", | ||
) | ||
self.assertEqual( | ||
args.port_lists_url, | ||
"rsync://feed.community.greenbone.net/community/data-feed/22.04/port-lists/", | ||
f"rsync://feed.community.greenbone.net/community/data-feed/{DEFAULT_VERSION}/port-lists/", | ||
) | ||
self.assertEqual( | ||
args.report_formats_url, | ||
"rsync://feed.community.greenbone.net/community/data-feed/22.04/report-formats/", | ||
f"rsync://feed.community.greenbone.net/community/data-feed/{DEFAULT_VERSION}/report-formats/", | ||
) | ||
self.assertEqual( | ||
args.scan_configs_url, | ||
"rsync://feed.community.greenbone.net/community/data-feed/22.04/scan-configs/", | ||
f"rsync://feed.community.greenbone.net/community/data-feed/{DEFAULT_VERSION}/scan-configs/", | ||
) | ||
self.assertEqual( | ||
args.notus_url, | ||
"rsync://feed.community.greenbone.net/community/vulnerability-feed/22.04/vt-data/notus/", | ||
f"rsync://feed.community.greenbone.net/community/vulnerability-feed/{DEFAULT_VERSION}/vt-data/notus/", | ||
) | ||
self.assertEqual( | ||
args.nasl_url, | ||
"rsync://feed.community.greenbone.net/community/vulnerability-feed/22.04/vt-data/nasl/", | ||
f"rsync://feed.community.greenbone.net/community/vulnerability-feed/{DEFAULT_VERSION}/vt-data/nasl/", | ||
) | ||
self.assertEqual( | ||
args.scap_data_url, | ||
"rsync://feed.community.greenbone.net/community/vulnerability-feed/22.04/scap-data/", | ||
f"rsync://feed.community.greenbone.net/community/vulnerability-feed/{DEFAULT_VERSION}/scap-data/", | ||
) | ||
self.assertEqual( | ||
args.cert_data_url, | ||
"rsync://feed.community.greenbone.net/community/vulnerability-feed/22.04/cert-data/", | ||
f"rsync://feed.community.greenbone.net/community/vulnerability-feed/{DEFAULT_VERSION}/cert-data/", | ||
) | ||
|
||
@patch.object(sys, "argv", ["greenbone-nvt-sync"]) | ||
|