Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

- name: Install Tower CLI
run: |
wget https://github.com/seqeralabs/tower-cli/releases/download/v0.14.0/tw-linux-x86_64 \
wget https://github.com/seqeralabs/tower-cli/releases/download/v0.30.0/tw-linux-x86_64 \
&& chmod +x tw-linux-x86_64 \
&& sudo mv tw-linux-x86_64 /usr/local/bin/tw

Expand Down
2 changes: 2 additions & 0 deletions seqerakit/overwrite.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,8 @@ def delete_resource(self, block, operation, sp_args):
arguments defined in the operation dictionary.
"""
method_args = operation["method_args"](sp_args)
if block == "compute-envs":
method_args = list(method_args) + ["--wait"]
method = getattr(self.sp, block)
method(*method_args)

Expand Down
39 changes: 39 additions & 0 deletions tests/unit/test_overwrite.py
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,45 @@ def mock_json_response(*args, **kwargs):
with self.assertRaises(ResourceExistsError):
self.overwrite.handle_overwrite("credentials", args3)

def test_delete_resource_compute_envs_includes_wait(self):
"""Test that deleting compute-envs appends --wait to method args."""
operation = {
"method_args": lambda args: (
"delete",
"--name",
args["name"],
"--workspace",
args["workspace"],
),
}
sp_args = {"name": "test-ce", "workspace": "test-workspace"}

self.overwrite.delete_resource("compute-envs", operation, sp_args)

self.mock_sp.compute_envs = self.mock_sp.__getattr__("compute-envs")
self.mock_sp.__getattr__("compute-envs").assert_called_with(
"delete", "--name", "test-ce", "--workspace", "test-workspace", "--wait"
)

def test_delete_resource_credentials_does_not_include_wait(self):
"""Test that deleting non-compute-env resources does NOT append --wait."""
operation = {
"method_args": lambda args: (
"delete",
"--name",
args["name"],
"--workspace",
args["workspace"],
),
}
sp_args = {"name": "test-cred", "workspace": "test-workspace"}

self.overwrite.delete_resource("credentials", operation, sp_args)

self.mock_sp.__getattr__("credentials").assert_called_with(
"delete", "--name", "test-cred", "--workspace", "test-workspace"
)


# TODO: tests for destroy and JSON caching

Expand Down
Loading