Skip to content

Commit

Permalink
Merge pull request #57 from pacificclimate/i56-replace-docker-dev03
Browse files Browse the repository at this point in the history
I56 replace docker dev03
  • Loading branch information
eyvorchuk authored May 24, 2024
2 parents 8ffa215 + ac03a02 commit fe8249b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def mock_local_url(monkeypatch):

@pytest.fixture
def mock_dev_url(monkeypatch):
monkeypatch.setenv("DEV_URL", "http://docker-dev03.pcic.uvic.ca/somebird")
monkeypatch.setenv("DEV_URL", "http://marble-dev01.pcic.uvic.ca/somebird")


LOGGER = logging.getLogger("PYWPS")
Expand Down
2 changes: 1 addition & 1 deletion tests/test_file_handling.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
],
)
def test_is_opendap_url(url):
if "docker" in url:
if "marble" in url:
assert is_opendap_url(url) # Ensure function recognizes this is an opendap file
else:
assert not is_opendap_url(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def test_get_target_url_local(mock_local_url, bird, expected):
("chickadee"),
],
)
@pytest.mark.parametrize("expected", ["http://docker-dev03.pcic.uvic.ca/somebird"])
@pytest.mark.parametrize("expected", ["http://marble-dev01.pcic.uvic.ca/somebird"])
def test_get_target_url_dev(mock_dev_url, bird, expected):
assert get_target_url(bird) == expected

Expand Down
4 changes: 2 additions & 2 deletions wps_tools/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def url_path(sub_filepath, url_type, sub_dir="daccs"):
f'Invalid sub directory "{sub_dir}": must be one of "daccs" or "climate_explorer_data_prep"'
)

return f"https://docker-dev03.pcic.uvic.ca/twitcher/ows/proxy/thredds/{identifier}/datasets/storage/data/projects/comp_support/{path}/{sub_filepath}"
return f"https://marble-dev01.pcic.uvic.ca/twitcher/ows/proxy/thredds/{identifier}/datasets/storage/data/projects/comp_support/{path}/{sub_filepath}"


def client_for(service):
Expand Down Expand Up @@ -138,4 +138,4 @@ def get_target_url(bird):
if url:
return url

return f"https://docker-dev03.pcic.uvic.ca/twitcher/ows/proxy/{bird}/wps"
return f"https://marble-dev01.pcic.uvic.ca/twitcher/ows/proxy/{bird}/wps"

0 comments on commit fe8249b

Please sign in to comment.