Allow volume test to run outside an actual OpenStack VM

This commit is contained in:
Davanum Srinivas 2017-11-27 14:03:04 -05:00
parent f5299fe7e1
commit 076f4da28b

View File

@ -526,9 +526,8 @@ func TestVolumes(t *testing.T) {
id, err := os.InstanceID()
if err != nil {
t.Fatalf("Cannot find instance id: %v", err)
}
t.Logf("Cannot find instance id: %v - perhaps you are running this test outside a VM launched by OpenStack", err)
} else {
diskId, err := os.AttachDisk(id, vol)
if err != nil {
t.Fatalf("Cannot AttachDisk Cinder volume %s: %v", vol, err)
@ -550,6 +549,7 @@ func TestVolumes(t *testing.T) {
t.Logf("Volume (%s) detached\n", vol)
WaitForVolumeStatus(t, os, vol, volumeAvailableStatus)
}
err = os.DeleteVolume(vol)
if err != nil {