From: Chuck Short <chuck.short@canonical.com>
Date: Mon, 18 Feb 2013 14:11:20 +0000 (-0600)
Subject: Skip tests if cinder is not installed
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=64a1a32701c2afba78d3f3e704f36b8417277d63;p=openstack-build%2Fcinder-build.git

Skip tests if cinder is not installed

Skipp test_restry_disabled and test_retry_attempt_one
if cinder is not installed.

Change-Id: Iccc36e2ce0f57b5fa67566e1da543f9888bf0f57
Signed-off-by: Chuck Short <chuck.short@canonical.com>
---

diff --git a/cinder/tests/scheduler/test_filter_scheduler.py b/cinder/tests/scheduler/test_filter_scheduler.py
index 6579d6cb9..05b9d1d80 100644
--- a/cinder/tests/scheduler/test_filter_scheduler.py
+++ b/cinder/tests/scheduler/test_filter_scheduler.py
@@ -124,6 +124,8 @@ class FilterSchedulerTestCase(test_scheduler.SchedulerTestCase):
         self.assertRaises(exception.InvalidParameterValue,
                           fakes.FakeFilterScheduler)
 
+    @test.skip_if(not test_utils.is_cinder_installed(),
+                  'Test requires Cinder installed (try setup.py develop')
     def test_retry_disabled(self):
         # Retry info should not get populated when re-scheduling is off.
         self.flags(scheduler_max_attempts=1)
@@ -140,6 +142,8 @@ class FilterSchedulerTestCase(test_scheduler.SchedulerTestCase):
         # should not have retry info in the populated filter properties:
         self.assertFalse("retry" in filter_properties)
 
+    @test.skip_if(not test_utils.is_cinder_installed(),
+                  'Test requires Cinder installed (try setup.py develop')
     def test_retry_attempt_one(self):
         # Test retry logic on initial scheduling attempt.
         self.flags(scheduler_max_attempts=2)
@@ -156,6 +160,8 @@ class FilterSchedulerTestCase(test_scheduler.SchedulerTestCase):
         num_attempts = filter_properties['retry']['num_attempts']
         self.assertEqual(1, num_attempts)
 
+    @test.skip_if(not test_utils.is_cinder_installed(),
+                  'Test requires Cinder installed (try setup.py develop')
     def test_retry_attempt_two(self):
         # Test retry logic when re-scheduling.
         self.flags(scheduler_max_attempts=2)