[2/5] git commit: updated refs/heads/4.2 to f2d9a7b

[ts...@apache.org]

CLOUDSTACK-3619: Cleanup of volume is not required as gc takes care.

We don't need to delete the volume resource as part of cleanup as the
storage gc is expected to cleanup orphaned volumes in deleted
accounts/projects.

Signed-off-by: Prasanna Santhanam <ts...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8bc3757e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8bc3757e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8bc3757e

Branch: refs/heads/4.2
Commit: 8bc3757e80d20575d1eeee530309ab61c02857d8
Parents: 52fa853
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Thu Jul 18 14:59:35 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Thu Jul 18 14:59:35 2013 +0530

----------------------------------------------------------------------
 test/integration/component/test_projects.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc3757e/test/integration/component/test_projects.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py
index 68964e8..510542a 100644
--- a/test/integration/component/test_projects.py
+++ b/test/integration/component/test_projects.py
@@ -1203,10 +1203,9 @@ class TestProjectResources(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"])
+    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator", "needle"])
     def test_07_project_resources_account_delete(self):
-        """ Test Verify after an account is removed from the project, all his
-            resources stay with the project.
+        """ Test Verify after an account is removed from the project, all its resources stay with the project.
         """
         # Validate the following
         # 1. Create a project.
@@ -1261,13 +1260,13 @@ class TestProjectResources(cloudstackTestCase):
                            )
 
         # listProjectAccount to verify the user is added to project or not
-        accounts_reponse = Project.listAccounts(
+        accounts_response = Project.listAccounts(
                                         self.apiclient,
                                         projectid=project.id,
                                         account=self.user.name,
                                         )
         self.assertEqual(
-                            isinstance(accounts_reponse, list),
+                            isinstance(accounts_response, list),
                             True,
                             "Check for a valid list accounts response"
                             )
@@ -1277,7 +1276,7 @@ class TestProjectResources(cloudstackTestCase):
                     0,
                     "Check list project response returns a valid project"
                     )
-        account = accounts_reponse[0]
+        account = accounts_response[0]
 
         self.assertEqual(
                             account.role,
@@ -1292,9 +1291,8 @@ class TestProjectResources(cloudstackTestCase):
                                diskofferingid=self.disk_offering.id,
                                projectid=project.id
                                )
-        self.cleanup.append(volume)
 
-        # Delete the project user
+        # Delete the project user ie the account
         self.user.delete(self.apiclient)
 
         volumes = Volume.list(self.apiclient, id=volume.id)