From e650e098f48fc1730da6e6a1e6fb3a62267d60e7 Mon Sep 17 00:00:00 2001 From: Alex Robinson Date: Fri, 7 Aug 2015 00:29:36 +0000 Subject: [PATCH 1/2] Replace usage of ifup and ifdown in the reboot test with ifconfig. --- test/e2e/reboot.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/reboot.go b/test/e2e/reboot.go index 42929d691e3..c8e9a706af4 100644 --- a/test/e2e/reboot.go +++ b/test/e2e/reboot.go @@ -79,7 +79,7 @@ var _ = Describe("Reboot", func() { It("each node by switching off the network interface and ensure they function upon switch on", func() { // switch the network interface off for a while to simulate a network outage // We sleep 10 seconds to give some time for ssh command to cleanly finish before network is down. - testReboot(c, "nohup sh -c 'sleep 10 && sudo ifdown eth0 && sleep 120 && sudo ifup eth0' >/dev/null 2>&1 &") + testReboot(c, "nohup sh -c 'sleep 10 && sudo ifconfig eth0 down && sleep 120 && sudo ifconfig eth0 up' >/dev/null 2>&1 &") }) It("each node by dropping all inbound packets for a while and ensure they function afterwards", func() { From a2fea145428e8dcd02e86321e8f2f233f5cb93e5 Mon Sep 17 00:00:00 2001 From: Alex Robinson Date: Fri, 7 Aug 2015 00:32:05 +0000 Subject: [PATCH 2/2] Fix typo in an e2e test utility log message. --- test/e2e/util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/util.go b/test/e2e/util.go index d8928511b64..3449417c70e 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -1581,7 +1581,7 @@ func waitForNodeToBeNotReady(c *client.Client, name string, timeout time.Duratio func isNodeReadySetAsExpected(node *api.Node, wantReady bool) bool { // Check the node readiness condition (logging all). for i, cond := range node.Status.Conditions { - Logf("Node %s condition %d/%d: type: %v, status: %v, reason: %q, message: %q, last transistion time: %v", + Logf("Node %s condition %d/%d: type: %v, status: %v, reason: %q, message: %q, last transition time: %v", node.Name, i+1, len(node.Status.Conditions), cond.Type, cond.Status, cond.Reason, cond.Message, cond.LastTransitionTime) // Ensure that the condition type is readiness and the status