Merge lp:~zulcss/cinder/cinder-failed-tests into lp:~openstack-ubuntu-testing/cinder/grizzly

[Chuck Short]

fixes cinder ftbfs.

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-16 16:01:42 +0000
+++ debian/changelog	2013-01-30 14:25:31 +0000
@@ -7,6 +7,9 @@
   [ James Page ]
   * d/control: Add Suggests: python-hp3parclient for python-cinder.
 
+  [ Chuck Short ]
+  * debian/patches/fix-ubuntu-tests.patch: Fix failing tests
+
  -- Yolanda Robla <[e-mail]>  Mon, 14 Jan 2013 17:47:00 +0100
 
 cinder (2013.1~g2-0ubuntu2) raring; urgency=low
 
=== added file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-ubuntu-tests.patch	2013-01-30 14:25:31 +0000
@@ -0,0 +1,16 @@
+diff -Naurp cinder-2013.1.orig/cinder/tests/scheduler/test_capacity_weigher.py cinder-2013.1/cinder/tests/scheduler/test_capacity_weigher.py
+--- cinder-2013.1.orig/cinder/tests/scheduler/test_capacity_weigher.py	2013-01-30 07:42:25.000000000 -0600
++++ cinder-2013.1/cinder/tests/scheduler/test_capacity_weigher.py	2013-01-30 08:09:13.748906909 -0600
+@@ -18,10 +18,12 @@ Tests For Capacity Weigher.
+ 
+ from cinder import context
+ from cinder.openstack.common.scheduler.weights import HostWeightHandler
++from cinder import flags
+ from cinder import test
+ from cinder.tests.scheduler import fakes
+ from cinder.tests import utils as test_utils
+ 
++FLAGS = flags.FLAGS
+ 
+ class CapacityWeigherTestCase(test.TestCase):
+     def setUp(self):
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-01-14 16:48:12 +0000
+++ debian/patches/series	2013-01-30 14:25:31 +0000
@@ -1,2 +1,2 @@
 fix_cinder_dependencies.patch
-skip_failed_tests.patch
+fix-ubuntu-tests.patch
 
=== removed file 'debian/patches/skip_failed_tests.patch'
--- debian/patches/skip_failed_tests.patch	2013-01-10 12:31:13 +0000
+++ debian/patches/skip_failed_tests.patch	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-From 0a758a53c29364b7f52144f8f354b2121894e407 Mon Sep 17 00:00:00 2001
-From: Yolanda Robla <[e-mail]>
-Date: Thu, 10 Jan 2013 11:02:41 +0000
-Subject: [PATCH 2/2] Skip failing tests Signed-off-by: Yolanda Robla
- <[e-mail]>
-
----
- cinder/tests/scheduler/test_capacity_weigher.py |    6 ++++++
- cinder/tests/scheduler/test_filter_scheduler.py |    6 ++++++
- cinder/tests/scheduler/test_host_filters.py     |    4 ++++
- 3 files changed, 16 insertions(+)
-
-diff --git a/cinder/tests/scheduler/test_capacity_weigher.py b/cinder/tests/scheduler/test_capacity_weigher.py
-index 471364f..acee91d 100644
---- a/cinder/tests/scheduler/test_capacity_weigher.py
-+++ b/cinder/tests/scheduler/test_capacity_weigher.py
-@@ -46,6 +46,8 @@ class CapacityWeigherTestCase(test.TestCase):
-         return host_states
- 
-     def test_default_of_spreading_first(self):
-+        return True
-+
-         hostinfo_list = self._get_all_hosts()
- 
-         # host1: free_capacity_gb=1024, free=1024*(1-0.1)
-@@ -59,6 +61,8 @@ class CapacityWeigherTestCase(test.TestCase):
-         self.assertEqual(weighed_host.obj.host, 'host1')
- 
-     def test_capacity_weight_multiplier1(self):
-+        return True
-+
-         self.flags(capacity_weight_multiplier=-1.0)
-         hostinfo_list = self._get_all_hosts()
- 
-@@ -73,6 +77,8 @@ class CapacityWeigherTestCase(test.TestCase):
-         self.assertEqual(weighed_host.obj.host, 'host4')
- 
-     def test_capacity_weight_multiplier2(self):
-+        return True
-+
-         self.flags(capacity_weight_multiplier=2.0)
-         hostinfo_list = self._get_all_hosts()
- 
-diff --git a/cinder/tests/scheduler/test_filter_scheduler.py b/cinder/tests/scheduler/test_filter_scheduler.py
-index 6f56575..784b99f 100644
---- a/cinder/tests/scheduler/test_filter_scheduler.py
-+++ b/cinder/tests/scheduler/test_filter_scheduler.py
-@@ -41,6 +41,8 @@ class FilterSchedulerTestCase(test_scheduler.SchedulerTestCase):
-         """
-         Ensure empty hosts & child_zones result in NoValidHosts exception.
-         """
-+        return True
-+
-         def _fake_empty_call_zone_method(*args, **kwargs):
-             return []
- 
-@@ -55,6 +57,8 @@ class FilterSchedulerTestCase(test_scheduler.SchedulerTestCase):
-                           fake_context, request_spec, None)
- 
-     def test_create_volume_non_admin(self):
-+        return True
-+
-         """Test creating an instance locally using run_instance, passing
-         a non-admin context.  DB actions should work."""
-         self.was_admin = False
-@@ -79,6 +83,8 @@ class FilterSchedulerTestCase(test_scheduler.SchedulerTestCase):
-         self.assertTrue(self.was_admin)
- 
-     def test_schedule_happy_day(self):
-+        return True
-+
-         """Make sure there's nothing glaringly wrong with _schedule()
-         by doing a happy day pass through."""
- 
-diff --git a/cinder/tests/scheduler/test_host_filters.py b/cinder/tests/scheduler/test_host_filters.py
-index 5bcffd6..b80024d 100644
---- a/cinder/tests/scheduler/test_host_filters.py
-+++ b/cinder/tests/scheduler/test_host_filters.py
-@@ -76,6 +76,8 @@ class HostFiltersTestCase(test.TestCase):
-         self.stubs.Set(utils, 'service_is_up', fake_service_is_up)
- 
-     def test_capacity_filter_passes(self):
-+        return True
-+
-         self._stub_service_is_up(True)
-         filt_cls = self.class_map['CapacityFilter']()
-         filter_properties = {'size': 100}
-@@ -87,6 +89,8 @@ class HostFiltersTestCase(test.TestCase):
-         self.assertTrue(filt_cls.host_passes(host, filter_properties))
- 
-     def test_capacity_filter_fails(self):
-+        return True
-+
-         self._stub_service_is_up(True)
-         filt_cls = self.class_map['CapacityFilter']()
-         filter_properties = {'size': 100}
--- 
-1.7.9.5
-
 
=== modified file 'debian/rules'
--- debian/rules	2012-10-09 13:54:48 +0000
+++ debian/rules	2013-01-30 14:25:31 +0000
@@ -7,7 +7,7 @@
 	dh $@  --with python2
 
 get-orig-source:
-	uscan --verbose --force-download --rename --destdir=../build-area
+	uscan --verbose --rename --destdir=../build-area
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test: