Merge lp:~zulcss/nova/nova-testr into lp:~openstack-ubuntu-testing/nova/grizzly

[Chuck Short]

fixes ftbfs.

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-23 22:23:41 +0000
+++ debian/changelog	2013-01-25 20:32:20 +0000
@@ -1,4 +1,4 @@
-nova (2013.1~g2-0ubuntu4) UNRELEASED; urgency=low
+nova (2013.1~g2-0ubuntu3) UNRELEASED; urgency=low
 
   [ Chuck Short ]
   * New usptream release. 
@@ -7,6 +7,8 @@
   * debian/control, debian/nova-spiceproxy.{install, logrotate, upstart}:
     Add spice html5 proxy support.
   * debian/nova-novncproxy.upstart: Start on runlevel [2345]
+  * debian/rules: Call testr directly since run_tests.sh -N gives weird return
+    value when tests pass.
 
   [ Adam Gandelman ]
   * debian/control: Fix typo (websocikfy -> websockify).

=== modified file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	2013-01-22 17:59:02 +0000
+++ debian/patches/fix-ubuntu-tests.patch	2013-01-25 20:32:20 +0000
@@ -1,210 +1,31 @@
-From cec3e170c1727aa35d4c0229d8cd79f4c1c7f4d1 Mon Sep 17 00:00:00 2001
-From: Chuck Short <[e-mail]>
-Date: Tue, 22 Jan 2013 11:58:18 -0600
-Subject: [PATCH] fix
-
-Signed-off-by: Chuck Short <[e-mail]>
----
- nova/tests/baremetal/test_pxe.py | 2 ++
- nova/tests/test_api.py           | 2 +-
- nova/tests/test_image_utils.py   | 9 +++++++++
- nova/tests/test_imagebackend.py  | 5 +++++
- nova/tests/test_libvirt.py       | 3 +++
- nova/tests/test_libvirt_utils.py | 1 +
- tools/hacking.py                 | 3 +--
- 7 files changed, 22 insertions(+), 3 deletions(-)
-
-diff --git a/nova/tests/baremetal/test_pxe.py b/nova/tests/baremetal/test_pxe.py
-index 73ef8ca..26d2358 100644
---- a/nova/tests/baremetal/test_pxe.py
-+++ b/nova/tests/baremetal/test_pxe.py
-@@ -319,6 +319,7 @@ class PXEPrivateMethodsTestCase(BareMetalPXETestCase):
-         self.assertEqual(macs, address_list)
- 
-     def test_cache_tftp_images(self):
-+        self.skipTest('fails on buildds')
-         self.instance['kernel_id'] = 'aaaa'
-         self.instance['ramdisk_id'] = 'bbbb'
-         extra_specs = {
-@@ -341,6 +342,7 @@ class PXEPrivateMethodsTestCase(BareMetalPXETestCase):
-         self.mox.VerifyAll()
- 
-     def test_cache_image(self):
-+        self.skipTest('fails on buildds')
-         self.mox.StubOutWithMock(os, 'makedirs')
-         self.mox.StubOutWithMock(os.path, 'exists')
-         os.makedirs(pxe.get_image_dir_path(self.instance)).\
-diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py
-index fb2e76e..4cc3648 100644
---- a/nova/tests/test_api.py
-+++ b/nova/tests/test_api.py
-@@ -434,7 +434,7 @@ class ApiEc2TestCase(test.TestCase):
-                 raise self.failureException, 'EC2ResponseError not raised'
- 
-         # Invalid CIDR address
--        _assert('Invalid CIDR', 'tcp', 80, 81, '0.0.0.0/0444')
-+        #_assert('Invalid CIDR', 'tcp', 80, 81, '0.0.0.0/0444')
-         # Missing ports
-         _assert('Not enough parameters', 'tcp', '0.0.0.0/0')
-         # from port cannot be greater than to port
-diff --git a/nova/tests/test_image_utils.py b/nova/tests/test_image_utils.py
-index a9768f8..7e6e889 100644
---- a/nova/tests/test_image_utils.py
-+++ b/nova/tests/test_image_utils.py
-@@ -25,6 +25,7 @@ from nova.virt.libvirt import utils as libvirt_utils
- 
- class ImageUtilsTestCase(test.TestCase):
-     def test_disk_type(self):
-+        self.skipTest('fails on buildds')
-         # Seems like lvm detection
-         # if its in /dev ??
-         for p in ['/dev/b', '/dev/blah/blah']:
-@@ -54,6 +55,7 @@ disk size: 96K
-             self.mox.UnsetStubs()
- 
-     def test_disk_backing(self):
-+        self.skipTest('skipped by ubuntu buildds')
-         path = '/myhome/disk.config'
-         template_output = """image: %(path)s
- file format: raw
-@@ -74,6 +76,7 @@ disk size: 96K
-         self.assertEquals(None, d_backing)
- 
-     def test_disk_size(self):
-+        self.skipTest('fails on buildds')
-         path = '/myhome/disk.config'
-         template_output = """image: %(path)s
- file format: raw
-@@ -115,6 +118,7 @@ disk size: 96K
-             self.mox.UnsetStubs()
- 
-     def test_qemu_info_canon(self):
-+        self.skipTest('skipped on ubuntu')
-         path = "disk.config"
-         example_output = """image: disk.config
- file format: raw
-@@ -137,6 +141,7 @@ blah BLAH: bb
-         self.assertEquals(65536, image_info.cluster_size)
- 
-     def test_qemu_info_canon2(self):
-+        self.skipTest('skipped on ubuntu')
-         path = "disk.config"
-         example_output = """image: disk.config
- file format: QCOW2
-@@ -161,6 +166,7 @@ backing file: /var/lib/nova/a328c7998805951a_2
-                           image_info.backing_file)
- 
-     def test_qemu_backing_file_actual(self):
-+        return True
-         path = "disk.config"
-         example_output = """image: disk.config
- file format: raw
-@@ -188,6 +194,7 @@ backing file: /var/lib/nova/a328c7998805951a_2 (actual path: /b/3a988059e51a_2)
-                           image_info.backing_file)
- 
-     def test_qemu_info_convert(self):
-+        return True
-         path = "disk.config"
-         example_output = """image: disk.config
- file format: raw
-@@ -213,6 +220,8 @@ junk stuff: bbb
-         self.assertEquals(98304, image_info.disk_size)
- 
-     def test_qemu_info_snaps(self):
-+        return True
-+        self.skipTest('fails on buildds')
-         path = "disk.config"
-         example_output = """image: disk.config
- file format: raw
-diff --git a/nova/tests/test_imagebackend.py b/nova/tests/test_imagebackend.py
-index a9865cb..703d782 100644
---- a/nova/tests/test_imagebackend.py
-+++ b/nova/tests/test_imagebackend.py
-@@ -54,6 +54,7 @@ class _ImageTestCase(object):
-             fake_libvirt_utils))
- 
-     def test_cache(self):
-+        self.skipTest('fails on buildds')
-         self.mox.StubOutWithMock(os.path, 'exists')
-         os.path.exists(self.PATH).AndReturn(False)
-         os.path.exists(self.TEMPLATE_DIR).AndReturn(False)
-@@ -71,6 +72,7 @@ class _ImageTestCase(object):
-         self.mox.VerifyAll()
- 
-     def test_cache_image_exists(self):
-+        self.skipTest('fails on buildds')
-         self.mox.StubOutWithMock(os.path, 'exists')
-         os.path.exists(self.PATH).AndReturn(True)
-         self.mox.ReplayAll()
-@@ -81,6 +83,7 @@ class _ImageTestCase(object):
-         self.mox.VerifyAll()
- 
-     def test_cache_base_dir_exists(self):
-+        self.skipTest('skipped fails on buildds')
-         self.mox.StubOutWithMock(os.path, 'exists')
-         os.path.exists(self.PATH).AndReturn(False)
-         os.path.exists(self.TEMPLATE_DIR).AndReturn(True)
-@@ -97,6 +100,7 @@ class _ImageTestCase(object):
-         self.mox.VerifyAll()
- 
-     def test_cache_template_exists(self):
-+        self.skipTest('skipped fails on buildds')
-         self.mox.StubOutWithMock(os.path, 'exists')
-         os.path.exists(self.PATH).AndReturn(False)
-         os.path.exists(self.TEMPLATE_DIR).AndReturn(True)
-@@ -193,6 +197,7 @@ class Qcow2TestCase(_ImageTestCase, test.TestCase):
-         self.mox.VerifyAll()
- 
-     def test_create_image_with_size(self):
-+        self.skipTest('fails on ubuntu buildds')
-         fn = self.prepare_mocks()
-         fn(target=self.TEMPLATE_PATH)
-         self.mox.StubOutWithMock(os.path, 'exists')
-diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
-index 83b7f43..cbdf5e5 100644
---- a/nova/tests/test_libvirt.py
-+++ b/nova/tests/test_libvirt.py
-@@ -2603,6 +2603,7 @@ class LibvirtConnTestCase(test.TestCase):
-         db.instance_destroy(self.context, instance_ref['uuid'])
- 
-     def test_get_instance_disk_info_works_correctly(self):
-+        self.skipTest('fails on buidds')
-         # Test data
-         instance_ref = db.instance_create(self.context, self.test_instance)
-         dummyxml = ("<domain type='kvm'><name>instance-0000000a</name>"
-@@ -4235,6 +4236,7 @@ class LibvirtUtilsTestCase(test.TestCase):
-         libvirt_utils.create_image('qcow2', '/some/stuff', '1234567891234')
- 
-     def test_create_cow_image(self):
-+        self.skipTest('fails on buildds')
-         self.mox.StubOutWithMock(os.path, 'exists')
-         self.mox.StubOutWithMock(utils, 'execute')
-         rval = ('', '')
-@@ -4262,6 +4264,7 @@ class LibvirtUtilsTestCase(test.TestCase):
-                 self.assertEquals(result, expected_result)
- 
-     def test_get_disk_size(self):
-+        self.skipTest('fails on ubuntu buildds')
-         self.mox.StubOutWithMock(os.path, 'exists')
-         self.mox.StubOutWithMock(utils, 'execute')
-         os.path.exists('/some/path').AndReturn(True)
-diff --git a/nova/tests/test_libvirt_utils.py b/nova/tests/test_libvirt_utils.py
-index 60f0682..d395ac8 100644
---- a/nova/tests/test_libvirt_utils.py
-+++ b/nova/tests/test_libvirt_utils.py
-@@ -24,6 +24,7 @@ from nova.virt.libvirt import utils as libvirt_utils
- 
- class LibvirtUtilsTestCase(test.TestCase):
-     def test_get_disk_type(self):
-+        self.skipTest('fails on buildds')
-         path = "disk.config"
-         example_output = """image: disk.config
- file format: raw
-diff --git a/tools/hacking.py b/tools/hacking.py
-index 56f6694..5713435 100755
---- a/tools/hacking.py
-+++ b/tools/hacking.py
-@@ -565,7 +565,7 @@ if __name__ == "__main__":
+diff -Naurp nova-2013.1.orig/nova/tests/test_api.py nova-2013.1/nova/tests/test_api.py
+--- nova-2013.1.orig/nova/tests/test_api.py	2013-01-25 05:53:44.000000000 -0600
++++ nova-2013.1/nova/tests/test_api.py	2013-01-25 14:21:21.514255459 -0600
+@@ -26,9 +26,9 @@ from boto.ec2 import regioninfo
+ from boto import exception as boto_exc
+ # newer versions of boto use their own wrapper on top of httplib.HTTPResponse
+ try:
+-    import boto.connection as httplib
++    from boto.connection import HTTPResponse
+ except ImportError:
+-    import httplib
++    from httplib import HTTPResponse
+ import fixtures
+ import webob
+ 
+@@ -79,7 +79,7 @@ class FakeHttplibConnection(object):
+         # guess that's a function the web server usually provides.
+         resp = "HTTP/1.0 %s" % resp
+         self.sock = FakeHttplibSocket(resp)
+-        self.http_response = httplib.HTTPResponse(self.sock)
++        self.http_response = HTTPResponse(self.sock)
+         # NOTE(vish): boto is accessing private variables for some reason
+         self._HTTPConnection__response = self.http_response
+         self.http_response.begin()
+diff -Naurp nova-2013.1.orig/tools/hacking.py nova-2013.1/tools/hacking.py
+--- nova-2013.1.orig/tools/hacking.py	2013-01-25 05:53:45.000000000 -0600
++++ nova-2013.1/tools/hacking.py	2013-01-25 14:21:11.742255454 -0600
+@@ -571,7 +571,7 @@ if __name__ == "__main__":
      #include nova path
      sys.path.append(os.getcwd())
      #Run once tests (not per line)
@@ -213,14 +34,3 @@
      #NOVA error codes start with an N
      pep8.SELFTEST_REGEX = re.compile(r'(Okay|[EWN]\d{3}):\s(.*)')
      pep8.ERRORCODE_REGEX = re.compile(r'[EWN]\d{3}')
-@@ -580,7 +580,6 @@ if __name__ == "__main__":
- 
-     try:
-         pep8._main()
--        sys.exit(once_error)
-     finally:
-         if len(_missingImport) > 0:
-             print >> sys.stderr, ("%i imports missing in this test environment"
--- 
-1.8.0
-

=== modified file 'debian/rules'
--- debian/rules	2013-01-10 19:20:37 +0000
+++ debian/rules	2013-01-25 20:32:20 +0000
@@ -58,7 +58,7 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	./run_tests.sh -N
+	testr init && test run --parallel
 endif
 
 override_dh_python2: