fix unit tests

Jamie Hannaford · Jamie Hannaford · commit a3ad43a054ea · 2016-05-13T13:09:50.000+02:00
diff --git a/openstack/blockstorage/v2/extensions/volumeactions/requests_test.go b/openstack/blockstorage/v2/extensions/volumeactions/requests_test.go
@@ -18,7 +18,7 @@ func TestAttach(t *testing.T) {
 		Mode:         "rw",
 		InstanceUUID: "50902f4f-a974-46a0-85e9-7efc5e22dfdd",
 	}
-	_, err := Attach(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c", options).Extract()
+	err := Attach(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c", options).ExtractErr()
 	th.AssertNoErr(t, err)
 }
 
@@ -28,7 +28,7 @@ func TestDetach(t *testing.T) {
 
 	MockDetachResponse(t)
 
-	_, err := Detach(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c").Extract()
+	err := Detach(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c").ExtractErr()
 	th.AssertNoErr(t, err)
 }
 
@@ -38,7 +38,7 @@ func TestReserve(t *testing.T) {
 
 	MockReserveResponse(t)
 
-	_, err := Reserve(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c").Extract()
+	err := Reserve(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c").ExtractErr()
 	th.AssertNoErr(t, err)
 }
 
@@ -48,7 +48,7 @@ func TestUnreserve(t *testing.T) {
 
 	MockUnreserveResponse(t)
 
-	_, err := Unreserve(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c").Extract()
+	err := Unreserve(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c").ExtractErr()
 	th.AssertNoErr(t, err)
 }
 
@@ -84,6 +84,6 @@ func TestTerminateConnection(t *testing.T) {
 		Platform:  "x86_64",
 		OSType:    "linux2",
 	}
-	_, err := TerminateConnection(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c", options).Extract()
+	err := TerminateConnection(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c", options).ExtractErr()
 	th.AssertNoErr(t, err)
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ func TestAttach(t *testing.T) {`
`18`	`18`	`Mode: "rw",`
`19`	`19`	`InstanceUUID: "50902f4f-a974-46a0-85e9-7efc5e22dfdd",`
`20`	`20`	`}`
`21`		`- _, err := Attach(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c", options).Extract()`
	`21`	`+ err := Attach(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c", options).ExtractErr()`
`22`	`22`	`th.AssertNoErr(t, err)`
`23`	`23`	`}`
`24`	`24`
`@@ -28,7 +28,7 @@ func TestDetach(t *testing.T) {`
`28`	`28`
`29`	`29`	`MockDetachResponse(t)`
`30`	`30`
`31`		`- _, err := Detach(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c").Extract()`
	`31`	`+ err := Detach(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c").ExtractErr()`
`32`	`32`	`th.AssertNoErr(t, err)`
`33`	`33`	`}`
`34`	`34`
`@@ -38,7 +38,7 @@ func TestReserve(t *testing.T) {`
`38`	`38`
`39`	`39`	`MockReserveResponse(t)`
`40`	`40`
`41`		`- _, err := Reserve(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c").Extract()`
	`41`	`+ err := Reserve(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c").ExtractErr()`
`42`	`42`	`th.AssertNoErr(t, err)`
`43`	`43`	`}`
`44`	`44`
`@@ -48,7 +48,7 @@ func TestUnreserve(t *testing.T) {`
`48`	`48`
`49`	`49`	`MockUnreserveResponse(t)`
`50`	`50`
`51`		`- _, err := Unreserve(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c").Extract()`
	`51`	`+ err := Unreserve(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c").ExtractErr()`
`52`	`52`	`th.AssertNoErr(t, err)`
`53`	`53`	`}`
`54`	`54`
`@@ -84,6 +84,6 @@ func TestTerminateConnection(t *testing.T) {`
`84`	`84`	`Platform: "x86_64",`
`85`	`85`	`OSType: "linux2",`
`86`	`86`	`}`
`87`		`- _, err := TerminateConnection(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c", options).Extract()`
	`87`	`+ err := TerminateConnection(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c", options).ExtractErr()`
`88`	`88`	`th.AssertNoErr(t, err)`
`89`	`89`	`}`