Skip TestRoutes if extension or router-id is missing

dims · dims · commit cadccc679be8 · 2017-11-27T14:02:23.000-05:00
diff --git a/pkg/cloudprovider/providers/openstack/openstack_routes_test.go b/pkg/cloudprovider/providers/openstack/openstack_routes_test.go
@@ -37,9 +37,13 @@ func TestRoutes(t *testing.T) {
 		t.Fatalf("Failed to construct/authenticate OpenStack: %s", err)
 	}
 
+	if os.routeOpts.RouterId == "" {
+		t.Skip("router-id is empty. skipping test")
+	}
+
 	r, ok := os.Routes()
 	if !ok {
-		t.Fatalf("Routes() returned false - perhaps your stack doens't support Neutron?")
+		t.Skip("Routes() returned false - perhaps your stack does not support Neutron extraroute extension?")
 	}
 
 	newroute := cloudprovider.Route{

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,13 @@ func TestRoutes(t *testing.T) {`
`37`	`37`	`t.Fatalf("Failed to construct/authenticate OpenStack: %s", err)`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ if os.routeOpts.RouterId == "" {`
	`41`	`+ t.Skip("router-id is empty. skipping test")`
	`42`	`+ }`
	`43`	`+`
`40`	`44`	`r, ok := os.Routes()`
`41`	`45`	`if !ok {`
`42`		`- t.Fatalf("Routes() returned false - perhaps your stack doens't support Neutron?")`
	`46`	`+ t.Skip("Routes() returned false - perhaps your stack does not support Neutron extraroute extension?")`
`43`	`47`	`}`
`44`	`48`
`45`	`49`	`newroute := cloudprovider.Route{`