From e2704def9d9babbf8854e10f9b0dcd21c53a0fa6 Mon Sep 17 00:00:00 2001
From: Thomas Herve <therve@redhat.com>
Date: Wed, 3 Aug 2016 10:31:09 +0200
Subject: [PATCH] Remove additional purge test

We recently added a new integration test for purge to check purge per
project. It doesn't provide much more testing, and we can't actually
have 2 purge tests because they can't run in parallel to each other, so
let's remove it for now.

Change-Id: I9f0b97adae9ea532bc2453441c327e30b849d006
Closes-Bug: #1608910
---
 .../functional/test_purge.py                  | 42 -------------------
 1 file changed, 42 deletions(-)

diff --git a/heat_integrationtests/functional/test_purge.py b/heat_integrationtests/functional/test_purge.py
index ef742ef7b..fd652a971 100644
--- a/heat_integrationtests/functional/test_purge.py
+++ b/heat_integrationtests/functional/test_purge.py
@@ -11,7 +11,6 @@
 #    under the License.
 
 import time
-import uuid
 
 from oslo_concurrency import processutils
 
@@ -50,44 +49,3 @@ resources:
         stacks = dict((stack.id, stack) for stack in
                       self.client.stacks.list(show_deleted=True))
         self.assertNotIn(stack_identifier.split('/')[1], stacks)
-
-    def test_purge_project_id(self):
-        stack_identifier = self.stack_create(template=self.template)
-        self._stack_delete(stack_identifier)
-        stacks = dict((stack.id, stack) for stack in
-                      self.client.stacks.list(show_deleted=True))
-        self.assertIn(stack_identifier.split('/')[1], stacks)
-        fake_project_id = uuid.uuid4().hex
-        time.sleep(1)
-        cmd = "heat-manage purge_deleted -p %s 0" % fake_project_id
-        processutils.execute(cmd, shell=True)
-
-        stacks = dict((stack.id, stack) for stack in
-                      self.client.stacks.list(show_deleted=True))
-        self.assertIn(stack_identifier.split('/')[1], stacks)
-
-        time.sleep(1)
-        cmd = "heat-manage purge_deleted 0"
-        processutils.execute(cmd, shell=True)
-        stacks = dict((stack.id, stack) for stack in
-                      self.client.stacks.list(show_deleted=True))
-        self.assertNotIn(stack_identifier.split('/')[1], stacks)
-
-        # Test with tags
-        stack_identifier = self.stack_create(template=self.template,
-                                             tags="foo,bar")
-        self._stack_delete(stack_identifier)
-
-        time.sleep(1)
-        cmd = "heat-manage purge_deleted -p %s 0" % fake_project_id
-        processutils.execute(cmd, shell=True)
-        stacks = dict((stack.id, stack) for stack in
-                      self.client.stacks.list(show_deleted=True))
-        self.assertIn(stack_identifier.split('/')[1], stacks)
-
-        time.sleep(1)
-        cmd = "heat-manage purge_deleted 0"
-        processutils.execute(cmd, shell=True)
-        stacks = dict((stack.id, stack) for stack in
-                      self.client.stacks.list(show_deleted=True))
-        self.assertNotIn(stack_identifier.split('/')[1], stacks)