Merge pull request #1881 from freedomofpress/no-xdist

Stop running client tests in parallel with xdist
freedomofpress · Mar 5, 2024 · 727ceb8 · 727ceb8
2 parents b46c725 + 093ce89
commit 727ceb8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 40 deletions.
diff --git a/client/Makefile b/client/Makefile
@@ -56,8 +56,8 @@ TESTOPTS ?= -v --cov-config .coveragerc --cov-report html --cov-report term-miss
 RANDOM_SEED ?= $(shell bash -c 'echo $$RANDOM')
 
 .PHONY: test
-test: ## Run the application tests in parallel (for rapid development)
-	@TEST_CMD="poetry run pytest -v -n 4 --ignore=$(FTESTS) --ignore=$(ITESTS) $(TESTOPTS) $(TESTS)" ; \
+test: ## Run the application tests (for rapid development)
+	@TEST_CMD="poetry run pytest -v --ignore=$(FTESTS) --ignore=$(ITESTS) $(TESTOPTS) $(TESTS)" ; \
 		source scripts/setup-tmp-directories.sh; \
 		if command -v xvfb-run > /dev/null; then \
 		xvfb-run -a $$TEST_CMD ; else \
@@ -72,7 +72,7 @@ test-random: ## Run the application tests in random order
 
 .PHONY: test-integration
 test-integration: ## Run the integration tests
-	@TEST_CMD="poetry run pytest -v -n 4 $(ITESTS)" ; \
+	@TEST_CMD="poetry run pytest -v $(ITESTS)" ; \
 		if command -v xvfb-run > /dev/null; then \
 		xvfb-run -a $$TEST_CMD ; else \
 		$$TEST_CMD ; fi

diff --git a/client/poetry.lock b/client/poetry.lock
diff --git a/client/pyproject.toml b/client/pyproject.toml
@@ -41,7 +41,6 @@ pytest-mock = "*"
 pytest-qt = "^4.2.0"
 pytest-random-order = "*"
 pytest-vcr = "*"
-pytest-xdist = "^3.0.2"
 semgrep = "*"
 translate-toolkit = "*"
 types-polib = "*"