Skip to content

Commit

Permalink
minor fix
Browse files Browse the repository at this point in the history
  • Loading branch information
chriscchien committed Sep 26, 2024
1 parent 8763ccd commit 9583960
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions e2e/keywords/k8s.resource
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ Check node ${node_id} cordoned
Force drain node ${node_id} and expect failure
${drained_node} = get_node_by_index ${node_id}
${instance_manager_name} = get_instance_manager_on_node ${drained_node}
Run Keyword And Expect Error * force drain node ${drained_node}
Run Keyword And Expect Error * force_drain_node ${drained_node}
Set Test Variable ${instance_manager_name}
Set Test Variable ${drained_node}

Force drain node ${node_id} and expect success
${drained_node} = get_node_by_index ${node_id}
${instance_manager_name} = get_instance_manager_on_node ${drained_node}
force drain node ${drained_node}
force_drain_node ${drained_node}
Set Test Variable ${instance_manager_name}
Set Test Variable ${drained_node}

Expand Down
2 changes: 1 addition & 1 deletion e2e/libs/utility/utility.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def subprocess_exec_cmd(cmd):
return res

def subprocess_exec_cmd_with_timeout(cmd, timeout):
res = subprocess.check_output(cmd, timeout)
res = subprocess.check_output(cmd, timeout=timeout)
logging(f"Executed command {cmd} with timeout {timeout}s, result {res}")
return res

Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/negative/node_drain.robot
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ Stopped replicas on deleted nodes should not be counted as healthy replicas when
And Power off node 1

When Force drain node 2 and expect failure
And Check instance-manager pod is running on node 2
And Check instance-manager pod is running on node 2
And Check volume 0 replica on node 2 exist

Setting Allow Node Drain with the Last Healthy Replica protects the last healthy replica with Pod Disruption Budget (PDB)
Expand Down Expand Up @@ -223,7 +223,7 @@ Setting Allow Node Drain with the Last Healthy Replica protects the last healthy
And Wait for volume 0 detached
And Power off node 1

When Force drain node 2 and expect failure
When Force drain node 2 and expect failure
And Check instance-manager pod is running on node 2

When Set setting node-drain-policy to always-allow
Expand Down

0 comments on commit 9583960

Please sign in to comment.