Skip to content

Commit 769f441

Browse files
committed
tests: Remove aggregate_tests.py
This was essentially unused now (originally it was used to randomize the test order). Signed-off-by: Jussi Kukkonen <[email protected]>
1 parent caa4960 commit 769f441

File tree

4 files changed

+7
-107
lines changed

4 files changed

+7
-107
lines changed

docs/CONTRIBUTING.rst

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,18 @@ you need debug/run outside ``tox``.
3939
Unit tests
4040
----------
4141

42-
More specifically, the Update Framework's test suite can be executed by invoking
43-
the test aggregation script inside the *tests* subdirectory. ``tuf`` and its
44-
dependencies must already be installed.
42+
test suite can be executed directly as well (in this case the environment managed by tox is
43+
not used):
4544
::
4645

47-
cd tests/
48-
python3 aggregate_tests.py
46+
python3 -m unittest
4947

5048

5149
Individual tests can also be executed. Optional ``-v`` flags can be added to
5250
increase log level up to DEBUG (``-vvvv``).
5351
::
5452

55-
cd tests/
56-
python3 test_updater_ng.py -v
53+
python3 tests/test_updater_ng.py -v
5754

5855

5956
Coverage
@@ -65,7 +62,7 @@ via PyPI).
6562
::
6663

6764
cd tests/
68-
coverage run aggregate_tests.py && coverage report
65+
coverage run -m unittest
6966

7067

7168
Auto-formatting

tests/aggregate_tests.py

Lines changed: 0 additions & 44 deletions
This file was deleted.

tests/repository_data/README.md

Lines changed: 0 additions & 48 deletions
This file was deleted.

tox.ini

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,9 @@ envlist = lint,docs,py
99
skipsdist = true
1010

1111
[testenv]
12-
# TODO: Consider refactoring the tests to not require the aggregation script
13-
# being invoked from the `tests` directory. This seems to be the convention and
14-
# would make use of other testing tools such as coverage/coveralls easier.
15-
changedir = tests
16-
1712
commands =
1813
python3 --version
19-
python3 -m coverage run aggregate_tests.py
14+
python3 -m coverage run -m unittest
2015
python3 -m coverage report --rcfile {toxinidir}/pyproject.toml -m --fail-under 97
2116

2217
deps =
@@ -37,7 +32,7 @@ commands_pre =
3732
python3 -m pip install --force-reinstall git+https://github.com/secure-systems-lab/securesystemslib.git@main#egg=securesystemslib[crypto,pynacl]
3833

3934
commands =
40-
python3 -m coverage run aggregate_tests.py
35+
python3 -m coverage run -m unittest
4136
python3 -m coverage report --rcfile {toxinidir}/pyproject.toml -m
4237

4338
[testenv:lint]

0 commit comments

Comments
 (0)