aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAdam Janovsky2021-05-11 17:02:24 +0200
committerAdam Janovsky2021-05-11 17:02:24 +0200
commit9d3455eb172b8ddd9df861124c01d2f4f64eec16 (patch)
tree7e608f69de3ba342c84eefced0023ba660398888
parenta117f3407b30a8ec6522c2ab5d93955b6bdd8ca6 (diff)
downloadsec-certs-9d3455eb172b8ddd9df861124c01d2f4f64eec16.tar.gz
sec-certs-9d3455eb172b8ddd9df861124c01d2f4f64eec16.tar.zst
sec-certs-9d3455eb172b8ddd9df861124c01d2f4f64eec16.zip
fix test path problems
-rw-r--r--.github/workflows/tests.yml2
-rw-r--r--examples/cc_oop_demo.py1
-rw-r--r--sec_certs/configuration.py1
-rw-r--r--tests/test_cve_cpe_matching.py1
4 files changed, 2 insertions, 3 deletions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f7e8b5d4..a91437cd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,4 +19,4 @@ jobs:
pip install pytest
pip install pytest-cov
pip install ".[dev,test]"
- pytest tests
+ python3 -m unittest discover tests
diff --git a/examples/cc_oop_demo.py b/examples/cc_oop_demo.py
index ec68f4ee..63be8a32 100644
--- a/examples/cc_oop_demo.py
+++ b/examples/cc_oop_demo.py
@@ -3,7 +3,6 @@ from datetime import datetime
import logging
from sec_certs.dataset.common_criteria import CCDataset
-import sec_certs.constants as constants
from sec_certs.configuration import config
logger = logging.getLogger(__name__)
diff --git a/sec_certs/configuration.py b/sec_certs/configuration.py
index 9f882aae..27e1360c 100644
--- a/sec_certs/configuration.py
+++ b/sec_certs/configuration.py
@@ -19,6 +19,7 @@ class Configuration(object):
return res['value']
return object.__getattribute__(self, key)
+
config_path = files(sec_certs).joinpath('settings.yaml')
config = Configuration()
config.load(config_path)
diff --git a/tests/test_cve_cpe_matching.py b/tests/test_cve_cpe_matching.py
index 6bd7b013..89f4cef8 100644
--- a/tests/test_cve_cpe_matching.py
+++ b/tests/test_cve_cpe_matching.py
@@ -1,6 +1,5 @@
from unittest import TestCase
from sec_certs.dataset.common_criteria import CCDataset
-from sec_certs.certificate.common_criteria import CommonCriteriaCert
from sec_certs.dataset.cpe import CPEDataset, CPE
from sec_certs.dataset.cve import CVEDataset, CVE
from pathlib import Path