fix: traefik router for acme certs (#1068)

* fix: traefik router for acme certs

* fix: set default for sites

* test: use .localhost site names
This commit is contained in:
Revant Nandgaonkar
2023-02-02 13:45:06 +05:30
committed by GitHub
parent 8f843c1522
commit a580385295
6 changed files with 30 additions and 5 deletions

View File

@@ -1,4 +1,5 @@
import os
import re
import shutil
import subprocess
from dataclasses import dataclass
@@ -22,12 +23,27 @@ def _add_version_var(name: str, env_path: Path):
f.write(f"\n{name}={os.environ[name]}")
def _add_sites_var(env_path: Path):
with open(env_path, "r+") as f:
content = f.read()
content = re.sub(
rf"SITES=.*",
f"SITES=`tests.localhost`,`test-erpnext-site.localhost`,`test-pg-site.localhost`",
content,
)
f.seek(0)
f.truncate()
f.write(content)
@pytest.fixture(scope="session")
def env_file(tmp_path_factory: pytest.TempPathFactory):
tmp_path = tmp_path_factory.mktemp("frappe-docker")
file_path = tmp_path / ".env"
shutil.copy("example.env", file_path)
_add_sites_var(file_path)
for var in ("FRAPPE_VERSION", "ERPNEXT_VERSION"):
_add_version_var(name=var, env_path=file_path)
@@ -52,7 +68,7 @@ def frappe_setup(compose: Compose):
@pytest.fixture(scope="session")
def frappe_site(compose: Compose):
site_name = "tests"
site_name = "tests.localhost"
compose.bench(
"new-site",
"--no-mariadb-socket",
@@ -77,7 +93,7 @@ def erpnext_setup(compose: Compose):
@pytest.fixture(scope="class")
def erpnext_site(compose: Compose):
site_name = "test_erpnext_site"
site_name = "test-erpnext-site.localhost"
args = [
"new-site",
"--no-mariadb-socket",