commit 9528b9d7122bba3d5e328f5151623f275f44ffa3
author Jenkins <jenkins@review.openstack.org> Tue Apr 30 16:49:54 2013 +0000
committer Gerrit Code Review <review@openstack.org> Tue Apr 30 16:49:54 2013 +0000
tree 74c0ab0cf79c862649ccd1e9a8e1d897c4ff9103
parent da969fcec43046d6cc428c66decd246af8fb5f16
parent 26d16ed3808fc179490f6e81620dac18455d7af1

Merge "Fixes volumes cleanup in base class"

tempest/tests/volume/base.py

diff --git a/tempest/tests/volume/base.py b/tempest/tests/volume/base.py
index 00e8668..978ec53 100644
--- a/tempest/tests/volume/base.py
+++ b/tempest/tests/volume/base.py
@@ -149,13 +149,13 @@
     def clear_volumes(cls):
         for volume in cls.volumes:
             try:
-                cls.volume_client.delete_volume(volume['id'])
+                cls.volumes_client.delete_volume(volume['id'])
             except Exception:
                 pass
 
         for volume in cls.volumes:
             try:
-                cls.servers_client.wait_for_resource_deletion(volume['id'])
+                cls.volumes_client.wait_for_resource_deletion(volume['id'])
             except Exception:
                 pass