Make t/real.t clean up after itself properly

diff --git a/t/real.t b/t/real.t
index 07b9d2c07e29c6b736d1d3774087f8d98385b0eb..29df623fb4faea6fb9a69e2723b3d7f603d8be19 100644 (file)
--- a/t/real.t
+++ b/t/real.t
@@ -34,7 +34,7 @@ my @vols = $sw->volumes;
 ok grep ({$_->name eq $vol->name} @vols), 'list_volumes';
 
 my ($debian) = grep { $_->name =~ /debian jessie/i } $sw->images;
-my $srv = $sw->create_server('mysrv', $org, $debian, {1 => {%$vol}});
+my $srv = $sw->create_server('mysrv', $org, $debian, {1 => $vol->id});
 note "Created new server $srv with name ", $srv->name;
 is $sw->server($srv)->name, $srv->name, 'get_server';
 $srv->{name} = 'testsrv';
@@ -52,8 +52,7 @@ note "This server can: ", join ' ', $sw->server_actions($srv);
 #$sw->update_snapshot($snp);
 #is $sw->snapshot($snp)->name, $snp->name, 'update_snapshot';
 
-sleep 20;
-
+@vols = map { $_->{id} } values %{$srv->volumes};
 $sw->delete_server($srv);
 $sw->delete_ip($ip);
-$sw->delete_volume($vol);
+$sw->delete_volume($_) for @vols;