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

Jump to bottom

Fix failing long tests #378

Merged
merged 4 commits into from
Feb 24, 2020
Merged

Fix failing long tests #378

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91a3149
Add pytest to requirements.txt
PrajwalM2212 Feb 21, 2020
5692543
Fix Long Tests
PrajwalM2212 Feb 24, 2020
7905393
Replace with new links
PrajwalM2212 Feb 24, 2020
a2484fb
Update pythonapp.yml
terriko Feb 24, 2020
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/pythonapp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a silly change! I'm going to see if I can remove it before merge.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Decided to just take the blank lines out, so now you have a different silly change. Oh well, end result is a cleaner file so I'll take it! (assuming github actions is working again...)

- name: try single cli run of tool
run: |
python -m cve_bin_tool.cli test/binaries
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt

- name: try single cli run of tool
run: |
python -m cve_bin_tool.cli test/binaries
Expand Down
3 changes: 1 addition & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
],
install_requires=["jsonschema>=3.0.2"],
extras_require={"dev": ["pytest"]},
install_requires=["jsonschema>=3.0.2", "pytest"],
packages=find_packages(),
entry_points={
"console_scripts": [
Expand Down
84 changes: 42 additions & 42 deletions test/test_scanner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,12 +666,6 @@ def test_binaries(self, binary, package, version, are_in, not_in):
"gnutls-cli",
"2.3.11",
),
(
"http://mirrors.kernel.org/fedora/releases/29/Workstation/x86_64/os/Packages/l/",
"libjpeg-turbo-2.0.0-1.fc29.x86_64.rpm",
"libjpeg-turbo",
"2.0.0",
),
(
"http://mirror.centos.org/centos/7/os/x86_64/Packages/",
"krb5-libs-1.15.1-37.el7_6.i686.rpm",
Expand All @@ -685,10 +679,28 @@ def test_binaries(self, binary, package, version, are_in, not_in):
"11.2.5.3.21", # Note that the full libdb version is longer than the package version
),
(
"http://mirrors.kernel.org/fedora/releases/29/Workstation/x86_64/os/Packages/l/",
"libgcrypt-1.8.3-3.fc29.x86_64.rpm",
"http://rpmfind.net/linux/mageia/distrib/5/i586/media/core/updates/",
"openssl-1.0.2g-1.1.mga5.i586.rpm",
"openssl",
"1.0.2g",
),
(
"https://kojipkgs.fedoraproject.org//packages/python3/3.8.2~rc1/1.fc33/aarch64/",
"python3-3.8.2~rc1-1.fc33.aarch64.rpm",
"python",
"3.8.2",
),
(
"http://rpmfind.net/linux/fedora/linux/releases/30/Everything/x86_64/os/Packages/l/",
"libjpeg-turbo-2.0.2-1.fc30.x86_64.rpm",
"libjpeg-turbo",
"2.0.2",
),
(
"http://rpmfind.net/linux/fedora/linux/releases/30/Everything/x86_64/os/Packages/l/",
"libgcrypt-1.8.4-3.fc30.x86_64.rpm",
"libgcrypt",
"1.8.3",
"1.8.4",
),
(
"https://nodejs.org/download/release/v9.9.0/",
Expand All @@ -697,28 +709,34 @@ def test_binaries(self, binary, package, version, are_in, not_in):
"9.9.0",
),
(
"http://mirrors.kernel.org/fedora/releases/29/Workstation/x86_64/os/Packages/n/",
"nss-softokn-3.39.0-2.fc29.x86_64.rpm",
"http://rpmfind.net/linux/openmandriva/3.0/repository/x86_64/main/updates/",
"nss-3.42.1-1-omv2015.0.x86_64.rpm",
"nss",
"3.39",
"3.42.1",
),
(
"http://rpmfind.net/linux/mageia/distrib/5/i586/media/core/updates/",
"openssl-1.0.2g-1.1.mga5.i586.rpm",
"openssl",
"1.0.2g",
"http://rpmfind.net/linux/fedora/linux/releases/30/Everything/x86_64/os/Packages/l/",
"libpng-1.6.36-1.fc30.x86_64.rpm",
"png",
"1.6.36",
),
(
"http://mirrors.kernel.org/fedora/releases/29/Workstation/x86_64/os/Packages/l/",
"libpng-1.6.34-6.fc29.x86_64.rpm",
"png",
"1.6.34",
"http://rpmfind.net/linux/fedora/linux/releases/30/Everything/x86_64/os/Packages/l/",
"libtiff-4.0.10-4.fc30.i686.rpm",
"tiff",
"4.0.10",
),
(
"https://kojipkgs.fedoraproject.org//packages/python3/3.8.2~rc1/1.fc33/aarch64/",
"python3-3.8.2~rc1-1.fc33.aarch64.rpm",
"python",
"3.8.2",
"http://rpmfind.net/linux/fedora/linux/releases/30/Everything/x86_64/os/Packages/l/",
"libxml2-2.9.9-2.fc30.x86_64.rpm",
"xml2",
"2.9.9",
),
(
"http://rpmfind.net/linux/fedora/linux/updates/testing/31/Everything/aarch64/Packages/z/",
"zlib-1.2.11-19.fc31.aarch64.rpm",
"zlib",
"1.2.11",
),
(
"https://kojipkgs.fedoraproject.org//packages/python3/3.8.2~rc1/1.fc33/aarch64/",
Expand Down Expand Up @@ -756,30 +774,12 @@ def test_binaries(self, binary, package, version, are_in, not_in):
"systemd",
"243",
),
(
"http://mirrors.kernel.org/fedora/releases/29/Workstation/x86_64/os/Packages/l/",
"libtiff-4.0.9-11.fc29.x86_64.rpm",
"tiff",
"4.0.9",
),
(
"http://mirror.centos.org/centos/7/os/x86_64/Packages/",
"xerces-c-3.1.1-9.el7.x86_64.rpm",
"xerces",
"3.1", # FIXME: This is a bug in our detection on Centos
),
(
"http://mirrors.kernel.org/fedora/releases/29/Workstation/x86_64/os/Packages/l/",
"libxml2-2.9.8-4.fc29.x86_64.rpm",
"xml2",
"2.9.8",
),
(
"http://mirrors.kernel.org/fedora/releases/29/Workstation/x86_64/os/Packages/z/",
"zlib-1.2.11-14.fc29.x86_64.rpm",
"zlib",
"1.2.11",
),
(
"https://rpmfind.net/linux/centos/6.10/os/i386/Packages/",
"icu-4.2.1-14.el6.i686.rpm",
Expand Down