Merge lp:~gandelman-a/ubuntu/saucy/quantum/stevedore into lp:~openstack-ubuntu-testing/neutron/havana

Proposed by Adam Gandelman on 2013-05-29
Status: Merged
Approved by: Chuck Short on 2013-05-31
Approved revision: 153
Merged at revision: 155
Proposed branch: lp:~gandelman-a/ubuntu/saucy/quantum/stevedore
Merge into: lp:~openstack-ubuntu-testing/neutron/havana
Diff against target: 42 lines (+8/-2)
2 files modified
debian/changelog (+6/-2)
debian/control (+2/-0)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/saucy/quantum/stevedore
Reviewer Review Type Date Requested Status
Adam Gandelman Resubmit on 2013-05-31
Review via email: mp+166357@code.launchpad.net

Description of the change

Should fix tests that are now failing:

======================================================================
ERROR: quantum.tests.unit.ml2.test_security_group.TestMl2SecurityGroupsXML.test_create_security_group_rule_duplicate_rule_in_post (subunit.RemotedTestCase)
quantum.tests.unit.ml2.test_security_group.TestMl2SecurityGroupsXML.test_create_security_group_rule_duplicate_rule_in_post
----------------------------------------------------------------------
_StringException: Empty attachments:
  stderr
  stdout

pythonlogging:'': {{{2013-05-29 13:36:52,211 INFO [quantum.manager] Loading Plugin: quantum.plugins.ml2.plugin.Ml2Plugin}}}

Traceback (most recent call last):
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/tests/unit/ml2/test_security_group.py", line 44, in setUp
    super(Ml2SecurityGroupsTestCase, self).setUp(PLUGIN_NAME)
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/tests/unit/test_extension_security_group.py", line 241, in setUp
    super(SecurityGroupDBTestCase, self).setUp(plugin)
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/tests/unit/test_db_plugin.py", line 124, in setUp
    self.api = APIRouter()
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/api/v2/router.py", line 76, in __init__
    plugin = manager.QuantumManager.get_plugin()
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/manager.py", line 201, in get_plugin
    return cls.get_instance().plugin
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/manager.py", line 196, in get_instance
    cls._create_instance()
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/openstack/common/lockutils.py", line 246, in inner
    retval = f(*args, **kwargs)
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/manager.py", line 190, in _create_instance
    cls._instance = cls()
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/manager.py", line 115, in __init__
    plugin_klass = importutils.import_class(plugin_provider)
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/openstack/common/importutils.py", line 30, in import_class
    __import__(mod_str)
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/plugins/ml2/plugin.py", line 39, in <module>
    from quantum.plugins.ml2 import managers
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/plugins/ml2/managers.py", line 19, in <module>
    import stevedore
ImportError: No module named stevedore

To post a comment you must log in.
Adam Gandelman (gandelman-a) wrote :

The (>= 0.8) is important.

review: Resubmit

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-05-21 16:07:46 +0000
3+++ debian/changelog 2013-05-29 18:55:32 +0000
4@@ -1,12 +1,16 @@
5-quantum (1:2013.2.a606.g058d156-0ubuntu1) UNRELEASED; urgency=low
6+quantum (1:2013.2.a606.g058d156-0ubuntu2) UNRELEASED; urgency=low
7
8+ [ Chuck Short ]
9 * New upstream release.
10 * debian/patches/fix-quantum-configuration.patch: Refreshed
11 * debian/control: Add testrepository.
12 * debian/control: Add subunit.
13 * debian/control: Add python-d21o1 and python-pbr as build-depends.
14
15- -- Chuck Short <zulcss@ubuntu.com> Tue, 30 Apr 2013 10:01:18 -0500
16+ [ Adam Gandelman ]
17+ * debian/control: Add python-stevedore (>= 0.8).
18+
19+ -- Adam Gandelman <adamg@ubuntu.com> Wed, 29 May 2013 11:54:06 -0700
20
21 quantum (1:2013.1-0ubuntu2) raring; urgency=low
22
23
24=== modified file 'debian/control'
25--- debian/control 2013-05-21 16:07:46 +0000
26+++ debian/control 2013-05-29 18:55:32 +0000
27@@ -36,6 +36,7 @@
28 python-setuptools,
29 python-setuptools-git,
30 python-simplejson,
31+ python-stevedore (>= 0.8),
32 python-sqlalchemy,
33 python-testtools,
34 python-webob,
35@@ -385,6 +386,7 @@
36 python-quantumclient (>= 1:0.1.0.1-0ubuntu1),
37 python-routes,
38 python-simplejson,
39+ python-stevedore (>= 0.8),
40 python-sqlalchemy,
41 python-webob,
42 ${misc:Depends},

Subscribers

People subscribed via source and target branches