Ubuntu
quantum package

Merge lp:~gandelman-a/ubuntu/quantal/quantum/2012.2.3-ftbfs into lp:~openstack-ubuntu-testing/neutron/folsom

  1. Quantal (12.10)
  2. 2012.2.3-ftbfs
  3. Merge into folsom
Proposed by Adam Gandelman
Status: Merged
Approved by: Chuck Short
Approved revision: 107
Merged at revision: 107
Proposed branch: lp:~gandelman-a/ubuntu/quantal/quantum/2012.2.3-ftbfs
Merge into: lp:~openstack-ubuntu-testing/neutron/folsom
Diff against target: 150 lines (+32/-16)
2 files modified
debian/changelog (+2/-0)
debian/patches/fix-ubuntu-tests.patch (+30/-16)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/quantal/quantum/2012.2.3-ftbfs
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+147217@code.launchpad.net

Description of the change

The 2012.2.3 update makes some changes to existing tests that now require udev monitors to be setup. They fail builds on Ubuntu buildds and need to be skipped.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-02-05 22:00:14 +0000
3+++ debian/changelog 2013-02-07 19:48:33 +0000
4@@ -37,6 +37,8 @@
5 - [01ea272] delete router fails with internal sever error when floatingip
6 association remains LP: 1080638
7 - [8017d09] Fix rpc control_exchange regression.
8+ * debian/patches/fix-ubuntu-tests.patch: Refreshed, added skipTests for
9+ linuxbridge tests that attempt to setup udev monitors.
10
11 -- Adam Gandelman <adamg@ubuntu.com> Tue, 05 Feb 2013 13:58:49 -0400
12
13
14=== modified file 'debian/patches/fix-ubuntu-tests.patch'
15--- debian/patches/fix-ubuntu-tests.patch 2012-09-21 17:52:21 +0000
16+++ debian/patches/fix-ubuntu-tests.patch 2013-02-07 19:48:33 +0000
17@@ -1,9 +1,10 @@
18 Description: Disable tests that fail in the buildd.
19 Author: Chuck short <zulcss@ubuntu.com>
20
21-diff -Naupr quantum-2012.2.orig/quantum/tests/unit/test_debug_commands.py quantum-2012.2/quantum/tests/unit/test_debug_commands.py
22---- quantum-2012.2.orig/quantum/tests/unit/test_debug_commands.py 2012-09-21 11:20:25.000000000 -0500
23-+++ quantum-2012.2/quantum/tests/unit/test_debug_commands.py 2012-09-21 12:50:05.423365402 -0500
24+Index: quantum-2012.2.3/quantum/tests/unit/test_debug_commands.py
25+===================================================================
26+--- quantum-2012.2.3.orig/quantum/tests/unit/test_debug_commands.py 2013-01-31 14:59:39.000000000 -0800
27++++ quantum-2012.2.3/quantum/tests/unit/test_debug_commands.py 2013-02-06 18:20:55.713822594 -0800
28 @@ -15,6 +15,7 @@
29 # License for the specific language governing permissions and limitations
30 # under the License.
31@@ -12,7 +13,7 @@
32 import socket
33 import sys
34 import uuid
35-@@ -30,6 +31,7 @@ from quantum.debug import commands
36+@@ -30,6 +31,7 @@
37 from quantum.debug.debug_agent import DEVICE_OWNER_PROBE, QuantumDebugAgent
38 from quantum.openstack.common import cfg
39
40@@ -20,7 +21,7 @@
41
42 class MyApp(object):
43 def __init__(self, _stdout):
44-@@ -130,6 +132,7 @@ class TestDebugCommands(unittest.TestCas
45+@@ -130,6 +132,7 @@
46 )])
47
48 def test_delete_probe(self):
49@@ -28,7 +29,7 @@
50 cmd = commands.DeleteProbe(self.app, None)
51 cmd_parser = cmd.get_parser('delete_probe')
52 args = ['fake_port']
53-@@ -143,6 +146,7 @@ class TestDebugCommands(unittest.TestCas
54+@@ -143,6 +146,7 @@
55 namespace=namespace)])
56
57 def test_delete_probe_without_namespace(self):
58@@ -36,7 +37,7 @@
59 cfg.CONF.set_override('use_namespaces', False)
60 cmd = commands.DeleteProbe(self.app, None)
61 cmd_parser = cmd.get_parser('delete_probe')
62-@@ -155,6 +159,7 @@ class TestDebugCommands(unittest.TestCas
63+@@ -155,6 +159,7 @@
64 mock.call.unplug('tap12345678-12')])
65
66 def test_list_probe(self):
67@@ -44,7 +45,7 @@
68 cmd = commands.ListProbe(self.app, None)
69 cmd_parser = cmd.get_parser('list_probe')
70 args = []
71-@@ -164,6 +169,7 @@ class TestDebugCommands(unittest.TestCas
72+@@ -164,6 +169,7 @@
73 [mock.call.list_ports(device_owner=DEVICE_OWNER_PROBE)])
74
75 def test_exec_command(self):
76@@ -52,7 +53,7 @@
77 cmd = commands.ExecProbe(self.app, None)
78 cmd_parser = cmd.get_parser('exec_command')
79 args = ['fake_port', 'fake_command']
80-@@ -174,6 +180,7 @@ class TestDebugCommands(unittest.TestCas
81+@@ -174,6 +180,7 @@
82 self.client.assert_has_calls([mock.call.show_port('fake_port')])
83
84 def test_exec_command_without_namespace(self):
85@@ -60,7 +61,7 @@
86 cfg.CONF.set_override('use_namespaces', False)
87 cmd = commands.ExecProbe(self.app, None)
88 cmd_parser = cmd.get_parser('exec_command')
89-@@ -185,6 +192,7 @@ class TestDebugCommands(unittest.TestCas
90+@@ -185,6 +192,7 @@
91 self.client.assert_has_calls([mock.call.show_port('fake_port')])
92
93 def test_clear_probe(self):
94@@ -68,7 +69,7 @@
95 cmd = commands.ClearProbe(self.app, None)
96 cmd_parser = cmd.get_parser('clear_probe')
97 args = []
98-@@ -201,6 +209,7 @@ class TestDebugCommands(unittest.TestCas
99+@@ -201,6 +209,7 @@
100 namespace=namespace)])
101
102 def test_ping_all_with_ensure_port(self):
103@@ -76,7 +77,7 @@
104 fake_ports = self.fake_ports
105
106 def fake_port_list(network_id=None, device_owner=None, device_id=None):
107-@@ -235,6 +244,7 @@ class TestDebugCommands(unittest.TestCas
108+@@ -235,6 +244,7 @@
109 )])
110
111 def test_ping_all(self):
112@@ -84,7 +85,7 @@
113 cmd = commands.PingAll(self.app, None)
114 cmd_parser = cmd.get_parser('ping_all')
115 args = []
116-@@ -258,6 +268,7 @@ class TestDebugCommands(unittest.TestCas
117+@@ -258,6 +268,7 @@
118 self.client.assert_has_calls(expected)
119
120 def test_ping_all_v6(self):
121@@ -92,9 +93,10 @@
122 fake_subnet_v6 = {'subnet': {'name': 'fake_v6',
123 'ip_version': 6}}
124 self.client.show_subnet.return_value = fake_subnet_v6
125-diff -Naupr quantum-2012.2.orig/quantum/tests/unit/test_linux_ip_lib.py quantum-2012.2/quantum/tests/unit/test_linux_ip_lib.py
126---- quantum-2012.2.orig/quantum/tests/unit/test_linux_ip_lib.py 2012-09-21 11:20:25.000000000 -0500
127-+++ quantum-2012.2/quantum/tests/unit/test_linux_ip_lib.py 2012-09-21 12:49:05.327363942 -0500
128+Index: quantum-2012.2.3/quantum/tests/unit/test_linux_ip_lib.py
129+===================================================================
130+--- quantum-2012.2.3.orig/quantum/tests/unit/test_linux_ip_lib.py 2013-01-31 14:59:39.000000000 -0800
131++++ quantum-2012.2.3/quantum/tests/unit/test_linux_ip_lib.py 2013-02-06 18:20:55.713822594 -0800
132 @@ -15,6 +15,7 @@
133 # License for the specific language governing permissions and limitations
134 # under the License.
135@@ -103,3 +105,15 @@
136 import mock
137 import unittest2 as unittest
138
139+Index: quantum-2012.2.3/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
140+===================================================================
141+--- quantum-2012.2.3.orig/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py 2013-01-31 14:59:39.000000000 -0800
142++++ quantum-2012.2.3/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py 2013-02-06 18:26:49.121809612 -0800
143+@@ -26,6 +26,7 @@
144+ class TestLinuxBridge(unittest.TestCase):
145+
146+ def setUp(self):
147++ self.skipTest('udev access on Ubuntu buildd causes failure.')
148+ self.addCleanup(cfg.CONF.reset)
149+ interface_mappings = {'physnet1': 'eth1'}
150+ root_helper = cfg.CONF.AGENT.root_helper

Subscribers

People subscribed via source and target branches