Skip to content

Commit

Permalink
Merge branch 'master' into flow-username
Browse files Browse the repository at this point in the history
  • Loading branch information
asvetlov authored Oct 23, 2024
2 parents ce6ea5f + e4f7a18 commit c51acf2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion tests/e2e/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def ws(
async def api_config(tmp_path_factory: Any) -> AsyncIterator[Optional[pathlib.Path]]:
e2e_test_token = os.environ.get("E2E_USER_TOKEN")
e2e_test_api_endpoint = os.environ.get(
"E2E_API_ENDPOINT", "https://dev.neu.ro/api/v1"
"E2E_API_ENDPOINT", "https://api.dev.apolo.us/api/v1"
)
if e2e_test_token:
tmp_path = tmp_path_factory.mktemp("config")
Expand Down
4 changes: 1 addition & 3 deletions tests/unit/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ def assets() -> pathlib.Path:
@pytest.fixture(scope="session")
def api_config(tmp_path_factory: Any) -> Iterator[pathlib.Path]:
e2e_test_token = os.environ.get("E2E_USER_TOKEN")
e2e_test_api_endpoint = os.environ.get(
"E2E_API_ENDPOINT", "https://dev.neu.ro/api/v1"
)
e2e_test_api_endpoint = "https://api.dev.apolo.us/api/v1"
if e2e_test_token:
tmp_path = tmp_path_factory.mktemp("config")
config_path = tmp_path / "conftest"
Expand Down

0 comments on commit c51acf2

Please sign in to comment.