Make it easier to target specific tests when running tests with Docke…

…r. (#27)

CONTRIBUTING.md

@@ -99,11 +99,14 @@ When you run `make server` or `make server-shell`, the database will be spun up
 Tests are run using `pytest`. Some commands you may need are listed below. The full documentation can be found at: https://docs.pytest.org/en/6.2.x/. There is some additional Pytest config in the `pyproject.toml` file at the root of the repo. Running `make pytest` will automatically migrate the database for you to the latest version by running `alembic upgrade head` before the `pytest` command itself.
 
 - Run all tests: `make pytest`
-- Run all tests in a directory: `make path=path/to/dir/ pytest`
-- Run all tests in a file: `make path=path/to/file.py pytest`
-- Run all tests within a class within a file: `make path=path/to/file.py::ClassName pytest`
-- Run a specific test within a class within a file: `make path=path/to/file.py::ClassName::method_name pytest`
-- Run a specific test within a file: `make path=path/to/file.py::method_name pytest`
+- Run all tests in a directory: `make pytestpath=path/to/dir/ pytest`
+- Run all tests in a file: `make pytestpath=path/to/file.py pytest`
+- Run all tests within a class within a file: `make pytestpath=path/to/file.py::ClassName pytest`
+- Run a specific test within a class within a file: `make pytestpath=path/to/file.py::ClassName::method_name pytest`
+- Run a specific test within a file: `make pytestpath=path/to/file.py::method_name pytest`
+- Run integration tests (access): `make pytest-integration-access`
+- Run integration tests (erasure): `make pytest-integration-erasure`
+
 
 ### How to write tests
 

Makefile

@@ -99,10 +99,9 @@ mypy: compose-build
 pytest: compose-build
 	@echo "Running pytest unit tests..."
 	@docker-compose run $(IMAGE_NAME) \
-		pytest -m "not integration and not integration_erasure"
+		pytest $(pytestpath) -m "not integration and not integration_erasure"
 
-# Run the pytest integration tests. Note the inclusion of the unit tests "tests/" folder in the
-# pytest target; this is to reuse the test configuration, test fixtures, etc.
+# Run the pytest integration tests.
 pytest-integration-access: compose-build
 	@echo "Building additional Docker images for integration tests..."
 	@docker-compose -f docker-compose.yml -f docker-compose.integration-test.yml build
@@ -113,7 +112,7 @@ pytest-integration-access: compose-build
 	@echo "Running pytest integration tests..."
 	@docker-compose -f docker-compose.yml -f docker-compose.integration-test.yml \
 		run $(IMAGE_NAME) \
-		pytest -m integration tests/
+		pytest $(pytestpath) -m integration
 	@docker-compose -f docker-compose.yml -f docker-compose.integration-test.yml down --remove-orphans
 
 pytest-integration-erasure: compose-build
@@ -122,7 +121,7 @@ pytest-integration-erasure: compose-build
 	@echo "Running pytest integration tests..."
 	@docker-compose -f docker-compose.yml -f docker-compose.integration-test.yml \
 		run $(IMAGE_NAME) \
-		pytest -m integration_erasure tests/
+		pytest $(pytestpath) -m "integration_erasure"
 
 ####################
 # Utils