Merge pull request #348 from mariash/master [Finishes #161296504]

Add volume services tests

README.md

@@ -198,6 +198,12 @@ include_capi_no_bridge
 * `volume_service_create_config`: The JSON configuration that is used when volume service is created.
 * `volume_service_bind_config`: The JSON configuration that is used when volume service is bound to the test application.
 
+* `include_volume_services`: Flag to include the tests for volume services. Diego must be deployed for these tests to pass and volume service broker should be registered in platform.
+* `volume_service_name`: The name of the volume service provided by the volume service broker.
+* `volume_service_plan_name`: The name of the plan of the service provided by the volume service broker.
+* `volume_service_create_config`: The JSON configuration that is used when volume service is created.
+* `volume_service_bind_config`: The JSON configuration that is used when volume service is bound to the test application.
+
 #### Buildpack Names
 Many tests specify a buildpack when pushing an app, so that on diego the app staging process completes in less time. The default names for the buildpacks are as follows; if you have buildpacks with different names, you can override them by setting different names:
 

example-cats-config.json

@@ -37,6 +37,8 @@ IN DEVELOPMENT
   "include_zipkin": true,
   "include_assisted_credhub": true,
   "include_credhub": true,
+  "include_tcp_routing": true,
+  "include_volume_services": false,
   "stacks": [
     "cflinuxfs2",
     "cflinuxfs3"

volume_services/volume_services.go

@@ -42,7 +42,7 @@ var _ = VolumeServicesDescribe("Volume Services", func() {
 			"-f", filepath.Join(poraAsset, "manifest.yml"),
 			"-d", Config.GetAppsDomain(),
 			"--no-start",
-		).Wait()).To(Exit(0))
+		).Wait(Config.CfPushTimeoutDuration())).To(Exit(0))
 
 		By("creating a service")
 		createServiceSession := cf.Cf("create-service", serviceName, Config.GetVolumeServicePlanName(), serviceInstanceName, "-c", Config.GetVolumeServiceCreateConfig())