Cinder

Merge lp:~zulcss/cinder/cinder-fix-ftbfs into lp:~ubuntu-server-dev/cinder/havana

  1. cinder-fix-ftbfs
  2. Merge into havana
Proposed by Chuck Short
Status: Merged
Approved by: Adam Gandelman
Approved revision: 142
Merged at revision: 142
Proposed branch: lp:~zulcss/cinder/cinder-fix-ftbfs
Merge into: lp:~ubuntu-server-dev/cinder/havana
Diff against target: 72 lines (+9/-10)
3 files modified
debian/changelog (+1/-1)
debian/control (+1/-1)
debian/patches/fix-sqlalchemy-requirements.patch (+7/-8)
To merge this branch: bzr merge lp:~zulcss/cinder/cinder-fix-ftbfs
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+187236@code.launchpad.net

Description of the change

- Rediffed patch
- Bump python-noavclient to >= 2.15.0

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-09-19 18:36:21 +0000
3+++ debian/changelog 2013-09-24 13:28:29 +0000
4@@ -12,7 +12,7 @@
5 python-lxml, python-webob, python-oslo.config, python-sqlalchemy,
6 python-fixtures, python-testtools, and python-fixtures
7 - Bumped versioned dependencies for python-eventlet, python-hp3parclient,
8- and python-keystoneclient,
9+ python-keystoneclient, and python-novaclient
10
11 -- Chuck Short <zulcss@ubuntu.com> Tue, 10 Sep 2013 11:45:33 -0400
12
13
14=== modified file 'debian/control'
15--- debian/control 2013-09-20 13:35:06 +0000
16+++ debian/control 2013-09-24 13:28:29 +0000
17@@ -24,7 +24,7 @@
18 python-mox,
19 python-mysqldb,
20 python-netaddr,
21- python-novaclient (>= 1:2.12.0),
22+ python-novaclient (>= 1:2.15.0),
23 python-oslo.config (>= 1:1.1.0),
24 python-paramiko (>= 1.8),
25 python-paste,
26
27=== modified file 'debian/patches/fix-sqlalchemy-requirements.patch'
28--- debian/patches/fix-sqlalchemy-requirements.patch 2013-09-10 16:54:59 +0000
29+++ debian/patches/fix-sqlalchemy-requirements.patch 2013-09-24 13:28:29 +0000
30@@ -1,5 +1,5 @@
31 diff --git a/cinder/tests/db/test_finish_migration.py b/cinder/tests/db/test_finish_migration.py
32-index 459dfea..716d76f 100644
33+index 4fba2a9..0d701aa 100644
34 --- a/cinder/tests/db/test_finish_migration.py
35 +++ b/cinder/tests/db/test_finish_migration.py
36 @@ -41,8 +41,11 @@ class FinishVolumeMigrationTestCase(test.TestCase):
37@@ -14,13 +14,13 @@
38 + except:
39 + self.skipTest('Test fails with sqlalchemy 0.9.8')
40
41- self.assertRaises(exception.VolumeNotFound, db.volume_get, ctxt,
42- dest_volume['id'])
43+ src_volume = db.volume_get(ctxt, src_volume['id'])
44+ expected_name = 'volume-%s' % dest_volume['id']
45 diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py
46-index f9b505e..730fd9a 100644
47+index 8ce5b73..dc02ee6 100644
48 --- a/cinder/tests/test_volume.py
49 +++ b/cinder/tests/test_volume.py
50-@@ -1663,8 +1663,11 @@ class VolumeTestCase(BaseVolumeTestCase):
51+@@ -1728,8 +1728,11 @@ class VolumeTestCase(BaseVolumeTestCase):
52 volume = tests_utils.create_volume(self.context, size=0,
53 host=CONF.host)
54 host_obj = {'host': 'newhost', 'capabilities': {}}
55@@ -35,10 +35,10 @@
56 self.assertEqual(volume['host'], 'newhost')
57 self.assertEqual(volume['migration_status'], None)
58 diff --git a/requirements.txt b/requirements.txt
59-index 01a80be..801736f 100644
60+index 01ec2e6..97d79d8 100644
61 --- a/requirements.txt
62 +++ b/requirements.txt
63-@@ -19,7 +19,7 @@ python-keystoneclient>=0.3.0
64+@@ -20,7 +20,7 @@ python-novaclient>=2.15.0
65 python-swiftclient>=1.5
66 Routes>=1.12.3
67 six
68@@ -47,4 +47,3 @@
69 sqlalchemy-migrate>=0.7.2
70 stevedore>=0.10
71 suds>=0.4
72-

Subscribers

People subscribed via source and target branches