From 599467124e812eb8ae73eb7a9af3fea71ee25157 Mon Sep 17 00:00:00 2001
From: Chris Behrens <cbehrens@codestud.com>
Date: Sun, 28 Aug 2011 23:39:43 -0700
Subject: fix for assertIn and assertNotIn use which was added in python 2.7. 
 this makes things work on 2.6 still

---
 nova/test.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/nova/test.py b/nova/test.py
index 88f1489e8..d1c1ad20e 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -277,3 +277,21 @@ class TestCase(unittest.TestCase):
                 continue
             else:
                 self.assertEqual(sub_value, super_value)
+
+    def assertIn(self, a, b):
+        """Python < v2.7 compatibility.  Assert 'a' in 'b'"""
+        try:
+            f = super(TestCase, self).assertIn
+        except AttributeError:
+            self.assertTrue(a in b)
+        else:
+            f(a, b)
+
+    def assertNotIn(self, a, b):
+        """Python < v2.7 compatibility.  Assert 'a' NOT in 'b'"""
+        try:
+            f = super(TestCase, self).assertNotIn
+        except AttributeError:
+            self.assertFalse(a in b)
+        else:
+            f(a, b)
-- 
cgit