Merge ~adam-collard/maas-ci/+git/system-tests:refresh-ip-between-reboots into ~maas-committers/maas-ci/+git/system-tests:master

Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 3e59a70a5eb0172bae313273b679d35ad6417fb7
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas-ci/+git/system-tests:refresh-ip-between-reboots
Merge into: ~maas-committers/maas-ci/+git/system-tests:master
Diff against target: 20 lines (+3/-0)
1 file modified
systemtests/tests/test_machine.py (+3/-0)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
MAAS Lander Approve
Review via email: mp+408935@code.launchpad.net

Commit message

Refresh machine by reading after each expected reboot (before SSH)

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b refresh-ip-between-reboots lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 3e59a70a5eb0172bae313273b679d35ad6417fb7

review: Approve
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/systemtests/tests/test_machine.py b/systemtests/tests/test_machine.py
2index df05604..7305ea4 100644
3--- a/systemtests/tests/test_machine.py
4+++ b/systemtests/tests/test_machine.py
5@@ -95,6 +95,8 @@ def test_machine(
6 ssh_execute_command(machine, "ubuntu", ssh_key, "echo test > ./test")
7 authenticated_admin.rescue_machine(machine)
8
9+ machine = authenticated_admin.read_machine(machine) # IP could change after deploy
10+
11 # Given that the machine is now in rescue mode, $HOME should be empty
12 stdout = ssh_execute_command(machine, "ubuntu", ssh_key, "ls")
13 assert stdout == ""
14@@ -105,6 +107,7 @@ def test_machine(
15
16 authenticated_admin.exit_rescue_machine(machine, next_status="deployed")
17
18+ machine = authenticated_admin.read_machine(machine) # IP could change after deploy
19 stdout = ssh_execute_command(machine, "ubuntu", ssh_key, "ls")
20 assert stdout.strip() == "test"
21

Subscribers

People subscribed via source and target branches

to all changes: