From: Mike Perez <thingee@gmail.com>
Date: Mon, 18 Feb 2013 19:17:26 +0000 (-0800)
Subject: Fix undef function call in test_migrations for py26
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e6134269a124037be1453f3a716c4cbfe8d1d54d;p=openstack-build%2Fcinder-build.git

Fix undef function call in test_migrations for py26

unittest does not have this function until later. This uses the already
imported cinder.test.skip_unless to accomplish the same result without
outputted error.

Change-Id: Id20add5a0d41e5d8cf6f8bc6aa0e547e5e386dab
---

diff --git a/cinder/tests/test_migrations.py b/cinder/tests/test_migrations.py
index 5ba715e31..936bd7ac9 100644
--- a/cinder/tests/test_migrations.py
+++ b/cinder/tests/test_migrations.py
@@ -276,10 +276,9 @@ class TestMigrations(test.TestCase):
         if _is_backend_avail('postgres', user="openstack_cifail"):
             self.fail("Shouldn't have connected")
 
+    @test.skip_unless(_is_backend_avail('postgres'),
+                      "postgresql not available")
     def test_postgresql_opportunistically(self):
-        # Test postgresql database migration walk
-        if not _is_backend_avail('postgres'):
-            self.skipTest("postgresql not available")
         # add this to the global lists to make reset work with it, it's removed
         # automatically in tearDown so no need to clean it up here.
         connect_string = _get_connect_string("postgres")