More merges from trunk. Not everything came over the first time.

2 files changed, 6 insertions, 7 deletions

diff --git a/nova/tests/auth_unittest.py b/nova/tests/auth_unittest.py
index 073ff71d2..2167c2385 100644
--- a/nova/tests/auth_unittest.py
+++ b/nova/tests/auth_unittest.py
@@ -193,9 +193,15 @@ class AuthTestCase(test.BaseTestCase):
         for vpn in vpns:
             vpn.destroy()
 
+    def test_214_can_retrieve_project_by_user(self):
+        project = self.manager.create_project('testproj2', 'test2', 'Another test project', ['test2'])
+        self.assert_(len(self.manager.get_projects()) > 1)
+        self.assertEqual(len(self.manager.get_projects('test2')), 1)
+
     def test_299_can_delete_project(self):
         self.manager.delete_project('testproj')
         self.assertFalse(filter(lambda p: p.name == 'testproj', self.manager.get_projects()))
+        self.manager.delete_project('testproj2')
 
     def test_999_can_delete_users(self):
         self.manager.delete_user('test1')
diff --git a/nova/tests/process_unittest.py b/nova/tests/process_unittest.py
index c96bb5913..1c15b69a0 100644
--- a/nova/tests/process_unittest.py
+++ b/nova/tests/process_unittest.py
@@ -120,10 +120,3 @@ class ProcessTestCase(test.TrialTestCase):
         pool2 = process.SharedPool()
         self.assert_(id(pool1) == id(pool2))
 
-    def test_shared_pool_works_as_singleton(self):
-        d1 = process.simple_execute('sleep 1')
-        d2 = process.simple_execute('sleep 0.005')
-        # lp609749: would have failed with
-        # exceptions.AssertionError: Someone released me too many times:
-        # too many tokens!
-        return d1