Various test fixes

hvac · briantist · Apr 13, 2024 · Aug 23, 2023 · Aug 29, 2023 · Sep 4, 2023
commit 1161ea4d16317cc1031cd82be159d69d123ff880
diff --git a/Makefile b/Makefile
@@ -3,9 +3,12 @@ REQUIREMENTS_FILES	:= requirements requirements-dev
 
 .PHONY: clean package publish test update-all-requirements typos $(addsuffix .txt, $(REQUIREMENTS_FILES)) docs/requirements.txt
 
-test:
+docker_test:
 	pytest --cov=hvac tests/
 
+test:
+	pytest --cov=hvac -n auto --dist worksteal tests/
+
 clean:
 	rm -rf dist hvac.egg-info
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -82,10 +82,6 @@ docutils = "^0.20"
 jinja2 = "<3.2.0"
 setuptools = "^69"
 
-
-[tool.pytest.ini_options]
-addopts = "-n auto --dist worksteal"
-
 [tool.typos.default.extend-words]
 Hashi = "Hashi"
 saftey = "saftey"

diff --git a/tests/config_files/vault-ldap/docker-compose.yml b/tests/config_files/vault-ldap/docker-compose.yml
@@ -35,5 +35,5 @@ services:
     environment:
       - LDAP_ADMIN_USERNAME=admin
       - LDAP_ADMIN_PASSWORD=adminpassword
-      - LDAP_USERS=vaulttest
-      - LDAP_PASSWORDS=vaulttestpassword
+      - LDAP_USERS=vaulttest,vaulttest1,vaulttest2
+      - LDAP_PASSWORDS=vaulttestpassword,vaulttestpassword,vaulttestpassword
diff --git a/tests/conftest.py → tests/integration_tests/conftest.py b/tests/conftest.py → tests/integration_tests/conftest.py