← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/kombu_tests_timeout.patch

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-24 13:12:53 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20120524131253-ommql08fg1en06ut
Tags: 2012.2~f1-0ubuntu1
https://launchpad.net/bugs/907197
* New upstream release.
* Prepare for quantal:
  - Dropped debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch
  - Dropped debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch
  - Dropped debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch
  - Dropped debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch
  - Dropped debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch
  - Dropped debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 
  - Dropped debian/patches/0001-fix-useexisting-deprecation-warnings.patch
* debian/control: Add python-keystone as a dependency. (LP: #907197)
* debian/patches/kombu_tests_timeout.patch: Refreshed.
* debian/nova.conf, debian/nova-common.postinst: Convert to new ini
  file configuration
* debian/patches/nova-manage_flagfile_location.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kombu_tests_timeout.patch
1
 
diff -Naurp nova-2012.1.orig/nova/tests/rpc/test_kombu.py nova-2012.1/nova/tests/rpc/test_kombu.py
2
 
--- nova-2012.1.orig/nova/tests/rpc/test_kombu.py       2012-01-20 02:30:56.000000000 -0500
3
 
+++ nova-2012.1/nova/tests/rpc/test_kombu.py    2012-01-20 12:40:25.373592963 -0500
4
 
@@ -201,6 +201,7 @@ class RpcKombuTestCase(common._BaseRpcTe
5
 
 
6
 
         self.assertEqual(info['called'], 2)
7
 
 
8
 
+    @test.skip_test("This tests does not timeout on Ubuntu")
9
 
     def test_iterconsume_errors_will_reconnect(self):
10
 
         conn = self.rpc.Connection()
11
 
         message = 'reconnect test message'
 
1
diff -Naurp nova-2012.2.orig/nova/tests/rpc/test_kombu.py nova-2012.2/nova/tests/rpc/test_kombu.py
 
2
--- nova-2012.2.orig/nova/tests/rpc/test_kombu.py       2012-05-03 03:02:36.000000000 -0400
 
3
+++ nova-2012.2/nova/tests/rpc/test_kombu.py    2012-05-03 10:24:15.693557103 -0400
 
4
@@ -19,6 +19,7 @@
 
5
 Unit Tests for remote procedure calls using kombu
 
6
 """
 
7
 
 
8
+from nose import SkipTest
 
9
 from nova import context
 
10
 from nova import exception
 
11
 from nova import flags
 
12
@@ -66,6 +67,12 @@ class RpcKombuTestCase(common.BaseRpcAMQ
 
13
             self.rpc = None
 
14
         super(RpcKombuTestCase, self).setUp()
 
15
 
 
16
+        # Skip tests if we are running in an ubuntu buildd
 
17
+        try:
 
18
+            fh = open('/dev/log')
 
19
+        except IOError as e:
 
20
+            raise SkipTest
 
21
+
 
22
     def tearDown(self):
 
23
         if kombu:
 
24
             impl_kombu.cleanup()