Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump technote-space/get-diff-action from 6.1.2 to 6.1.3 #19

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore(deps): bump technote-space/get-diff-action from 6.1.2 to 6.1.3 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45d6f6f
test: fix tests broken by improved data
terriko Jul 15, 2023
52906e9
chore(deps): bump technote-space/get-diff-action from 6.1.2 to 6.1.3
dependabot[bot] Jul 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ jobs:
with:
path: cache
key: Linux-cve-bin-tool-${{ steps.get-date.outputs.yesterday }}
- uses: technote-space/get-diff-action@f27caffdd0fb9b13f4fc191c016bb4e0632844af # v6.1.2
- uses: technote-space/get-diff-action@32707cfc11d81d19dfe37ec5201c269b32b15139 # v6.1.3
with:
PATTERNS: |
cve_bin_tool/checkers/*.py
Expand Down Expand Up @@ -253,7 +253,7 @@ jobs:
with:
path: cache
key: Linux-cve-bin-tool-${{ steps.get-date.outputs.yesterday }}
- uses: technote-space/get-diff-action@f27caffdd0fb9b13f4fc191c016bb4e0632844af # v6.1.2
- uses: technote-space/get-diff-action@32707cfc11d81d19dfe37ec5201c269b32b15139 # v6.1.3
with:
PATTERNS: |
cve_bin_tool/data_sources/*.py
Expand Down
13 changes: 1 addition & 12 deletions test/language_data/fail_pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
Expand Down Expand Up @@ -61,12 +56,6 @@
<version>1.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
Expand Down Expand Up @@ -500,4 +489,4 @@
</profile>
</profiles>

</project>
</project>
12 changes: 6 additions & 6 deletions test/test_language_scanner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,17 +162,17 @@ def setup_class(cls):
print("Database setup complete.")

@pytest.mark.parametrize(
"filename, product_name",
(((str(TEST_FILE_PATH / "pom.xml")), "commons_io"),),
"filename, product_list",
(((str(TEST_FILE_PATH / "pom.xml")), ["commons-io", "hamcrest"]),),
)
def test_java_package(self, filename: str, product_name: str) -> None:
def test_java_package(self, filename: str, product_list: set[str]) -> None:
scanner = VersionScanner()
scanner.file_stack.append(filename)
# Only expecting to get one product with a vendor in the database
# check list of product_names
for product in scanner.scan_file(filename):
if product:
product_info, file_path = product
assert product_info.product == product_name
assert product_info.product in product_list
assert file_path == filename

@pytest.mark.parametrize(
Expand Down Expand Up @@ -217,7 +217,7 @@ def test_language_package_none_found(self, filename: str) -> None:
(str(TEST_FILE_PATH / "cpanfile"), PERL_PRODUCTS),
],
)
def test_language_package(self, filename: str, products) -> None:
def test_language_package(self, filename: str, products: set[str]) -> None:
scanner = VersionScanner()
scanner.file_stack.append(filename)
found_product = []
Expand Down
6 changes: 3 additions & 3 deletions test/test_package_list_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,19 @@ class TestPackageListParser:

UBUNTU_PARSED_TRIAGE_DATA = {
ProductInfo(
vendor="gnu*", product="bash", version=UBUNTU_PACKAGE_VERSIONS[0]
vendor="unknown", product="bash", version=UBUNTU_PACKAGE_VERSIONS[0]
): {
"default": {"remarks": Remarks.NewFound, "comments": "", "severity": ""},
"paths": {""},
},
ProductInfo(
vendor="gnu*", product="binutils", version=UBUNTU_PACKAGE_VERSIONS[1]
vendor="unknown", product="binutils", version=UBUNTU_PACKAGE_VERSIONS[1]
): {
"default": {"remarks": Remarks.NewFound, "comments": "", "severity": ""},
"paths": {""},
},
ProductInfo(
vendor="gnu*", product="wget", version=UBUNTU_PACKAGE_VERSIONS[2]
vendor="unknown", product="wget", version=UBUNTU_PACKAGE_VERSIONS[2]
): {
"default": {"remarks": Remarks.NewFound, "comments": "", "severity": ""},
"paths": {""},
Expand Down