Don't continue the test if MakeTestStruct already failed

This closes a path to a nil-dereference panic when test setup fails.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>

Author: TBBle

plugins/nat/nat_windows_test.go

@@ -21,6 +21,7 @@ func TestNatCmdAdd(t *testing.T) {
 	testDualStack = (os.Getenv("TestDualStack") == "1")
 	imageToUse = os.Getenv("ImageToUse")
 	testNetwork := CreateNatTestNetwork()
-	pt := util.MakeTestStruct(t, testNetwork, "nat", false, false, "", testDualStack, imageToUse)
-	pt.RunAll(t)
+	if pt := util.MakeTestStruct(t, testNetwork, "nat", false, false, "", testDualStack, imageToUse); pt != nil {
+		pt.RunAll(t)
+	}
 }

plugins/sdnbridge/sdnbridge_windows_test.go

@@ -25,7 +25,8 @@ func TestBridgeCmdAdd(t *testing.T) {
 	testDualStack = (os.Getenv("TestDualStack") == "1")
 	imageToUse = os.Getenv("ImageToUse")
 	testNetwork := CreateBridgeTestNetwork()
-	pt := util.MakeTestStruct(t, testNetwork, "L2Bridge", true, true, "", testDualStack, imageToUse)
-	pt.Ipv6Url = os.Getenv("Ipv6UrlToUse")
-	pt.RunAll(t)
+	if pt := util.MakeTestStruct(t, testNetwork, "L2Bridge", true, true, "", testDualStack, imageToUse); pt != nil {
+		pt.Ipv6Url = os.Getenv("Ipv6UrlToUse")
+		pt.RunAll(t)
+	}
 }

plugins/sdnoverlay/sdnoverlay_windows_test.go

@@ -39,6 +39,7 @@ func TestOverlayCmdAdd(t *testing.T) {
 	testDualStack = (os.Getenv("TestDualStack") == "1")
 	imageToUse = os.Getenv("ImageToUse")
 	testNetwork := CreateOverlayTestNetwork()
-	pt := util.MakeTestStruct(t, testNetwork, "Overlay", true, false, "", testDualStack, imageToUse)
-	pt.RunAll(t)
+	if pt := util.MakeTestStruct(t, testNetwork, "Overlay", true, false, "", testDualStack, imageToUse); pt != nil {
+		pt.RunAll(t)
+	}
 }