From 2fc439c8600ef8c13c96924ca9a6efe7554e77ab Mon Sep 17 00:00:00 2001 From: mprahl Date: Wed, 18 Sep 2019 14:40:41 -0400 Subject: [PATCH] Allow running an individual test using a relative path Since the tests now run in a different location in the container since PR #1378, the documentation needed to be updated. Instead, we should just allow the user to pass a relative path instead. --- contrib/run-unittests.sh | 7 ++++++- docs/CONTRIBUTING.rst | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/contrib/run-unittests.sh b/contrib/run-unittests.sh index 1bc54c1f..d30df192 100755 --- a/contrib/run-unittests.sh +++ b/contrib/run-unittests.sh @@ -93,7 +93,12 @@ if [ -n "$with_pgsql" ]; then done fi -(cd "$source_dir" && $docker run "${container_opts[@]}" $test_image "$@") +tox_args=$@ +if [[ $tox_args == tests/* ]]; then + tox_args="/root/mbs/src/${tox_args}" +fi + +(cd "$source_dir" && $docker run "${container_opts[@]}" $test_image "$tox_args") rv=$? diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst index 6d5f8261..a45e6fbe 100644 --- a/docs/CONTRIBUTING.rst +++ b/docs/CONTRIBUTING.rst @@ -33,13 +33,13 @@ There are options to change the tests enviornment: For example, ``contrib/run-unittests.sh --py3 --with-pgsql``. You can specify the subset of tests to run inside the container as well. Tests -specified from command-line are passed to ``py.test`` directly. Please note that, -the path of each test must start with ``/src/``. For example:: +specified from the command-line are passed to ``py.test`` directly. Please note that, +the path of each test must be a relative path. For example:: contrib/run-unittests.sh \ - /src/tests/test_utils/ \ - /src/tests/test_mmd_resolver.py \ - /src/tests/test_builder/test_koji.py::TestKojiBuilder::test_tag_to_repo + tests/test_utils/ \ + tests/test_mmd_resolver.py \ + tests/test_builder/test_koji.py::TestKojiBuilder::test_tag_to_repo Inside Vagrant machine ----------------------