From 120c99cb065116e7b88d8679c0c6ca1a0f692ea5 Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Mon, 8 Aug 2022 13:27:52 +0100 Subject: [PATCH 1/2] Use PyTest for testing Nose is not maintained anymore Signed-off-by: Stefan Marr --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd825b50..160b969e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: yaml-parser: ['', 'ruamel'] include: - python-version: 2.7 - coverage: "--with-coverage --cover-package=rebench" + coverage: "--cov=rebench" exclude: - python-version: 2.7 yaml-parser: ruamel @@ -31,15 +31,15 @@ jobs: python-version: ${{ matrix.python-version }} architecture: x64 - - name: Install nose - run: pip install nose + - name: Install PyTest + run: pip install pytest - name: Install ruamel.yaml run: pip install ruamel.yaml if: matrix.yaml-parser == 'ruamel' - name: Install coverage and coveralls - run: pip install coverage coveralls + run: pip install pytest-cov coveralls if: matrix.coverage - name: Install ReBench dependencies @@ -47,7 +47,7 @@ jobs: - name: Run tests run: | - nosetests ${{ matrix.coverage }} + pytest ${{ matrix.coverage }} (cd rebench && rebench ../rebench.conf e:TestRunner2) - name: Install and run pylint From e3a4dd675fd994dc6fb2ae7121e0a8c15cac2209 Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Mon, 8 Aug 2022 13:28:13 +0100 Subject: [PATCH 2/2] Mark test helper classes as not being tests Signed-off-by: Stefan Marr --- rebench/interop/test_adapter.py | 1 + rebench/interop/test_vm_adapter.py | 1 + rebench/tests/features/issue_19_one_data_point_test.py | 1 + rebench/tests/persistence.py | 1 + 4 files changed, 4 insertions(+) diff --git a/rebench/interop/test_adapter.py b/rebench/interop/test_adapter.py index 150584f9..80f8e6c4 100644 --- a/rebench/interop/test_adapter.py +++ b/rebench/interop/test_adapter.py @@ -23,6 +23,7 @@ class TestAdapter(GaugeAdapter): + __test__ = False # This is not a test class test_data = [45872, 45871, 45868, 45869, 45873, 45865, 45869, 45874, 45863, 45873, diff --git a/rebench/interop/test_vm_adapter.py b/rebench/interop/test_vm_adapter.py index 5dcfe9a6..9b42e5d9 100644 --- a/rebench/interop/test_vm_adapter.py +++ b/rebench/interop/test_vm_adapter.py @@ -29,6 +29,7 @@ class TestExecutorAdapter(GaugeAdapter): in test/test.conf """ + __test__ = False # This is not a test class re_time = re.compile(r"RESULT-(\w+):\s*(\d+\.\d+)") def __init__(self, include_faulty, executor): diff --git a/rebench/tests/features/issue_19_one_data_point_test.py b/rebench/tests/features/issue_19_one_data_point_test.py index a4911c78..df94b2ec 100644 --- a/rebench/tests/features/issue_19_one_data_point_test.py +++ b/rebench/tests/features/issue_19_one_data_point_test.py @@ -27,6 +27,7 @@ class TestReporter(Reporter): + __test__ = False # This is not a test class def __init__(self, test_case): super(TestReporter, self).__init__() diff --git a/rebench/tests/persistence.py b/rebench/tests/persistence.py index 4fedb705..a6ff2500 100644 --- a/rebench/tests/persistence.py +++ b/rebench/tests/persistence.py @@ -1,4 +1,5 @@ class TestPersistence(object): + __test__ = False # This is not a test class def __init__(self): self._data_points = []