Depend on discover to fix python2.6 tests

It also fix a failure introduced by using 2.7-specific setUpClass.

Fixes: bug #1175753
Change-Id: I63ba61050602df92c654bd70519947965494df37

heat/tests/test_watch.py

@@ -37,9 +37,12 @@ class DummyAction:
 
 
 class WatchRuleTest(HeatTestCase):
+    stack_id = None
 
     @classmethod
-    def setUpClass(cls):
+    def setUpDatabase(cls):
+        if cls.stack_id is not None:
+            return
         # Create a dummy stack in the DB as WatchRule instances
         # must be associated with a stack
         utils.setup_dummy_db()
@@ -58,6 +61,7 @@ class WatchRuleTest(HeatTestCase):
 
     def setUp(self):
         super(WatchRuleTest, self).setUp()
+        self.setUpDatabase()
         self.username = 'watchrule_test_user'
 
         self.ctx = context.get_admin_context()

tools/test-requires

@@ -2,6 +2,7 @@
 distribute>=0.6.24
 
 coverage
+discover
 mox==0.5.3
 testrepository>=0.0.13
 paramiko