← Back to branch summary

~zulcss/cinder/taskflow

« back to all changes in this revision

Viewing changes to debian/patches/skip-sqlachemy-failures.patch

  • Committer: Adam Gandelman
  • Date: 2013-09-06 23:13:13 UTC
  • Revision ID: adamg@canonical.com-20130906231313-1epniu5kxitnwr0g
d/patches: Refresh.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/skip-sqlachemy-failures.patch
1
 
diff --git a/cinder/tests/db/test_finish_migration.py b/cinder/tests/db/test_finish_migration.py
2
 
index 459dfea..e7366da 100644
3
 
--- a/cinder/tests/db/test_finish_migration.py
4
 
+++ b/cinder/tests/db/test_finish_migration.py
5
 
@@ -41,8 +41,11 @@ class FinishVolumeMigrationTestCase(test.TestCase):
 
1
Index: cinder/cinder/tests/db/test_finish_migration.py
 
2
===================================================================
 
3
--- cinder.orig/cinder/tests/db/test_finish_migration.py        2013-09-06 16:12:30.347562596 -0700
 
4
+++ cinder/cinder/tests/db/test_finish_migration.py     2013-09-06 16:12:30.347562596 -0700
 
5
@@ -41,8 +41,11 @@
6
6
         dest_volume = testutils.create_volume(ctxt, host='dest',
7
7
                                               migration_status='target:fake',
8
8
                                               status='available')
16
16
 
17
17
         self.assertRaises(exception.VolumeNotFound, db.volume_get, ctxt,
18
18
                           dest_volume['id'])
19
 
diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py
20
 
index 87f86e7..3eb45e0 100644
21
 
--- a/cinder/tests/test_volume.py
22
 
+++ b/cinder/tests/test_volume.py
23
 
@@ -1413,8 +1413,12 @@ class VolumeTestCase(BaseVolumeTestCase):
24
 
 
25
 
         volume = self._create_volume(status='available')
 
19
Index: cinder/cinder/tests/test_volume.py
 
20
===================================================================
 
21
--- cinder.orig/cinder/tests/test_volume.py     2013-09-06 16:12:30.347562596 -0700
 
22
+++ cinder/cinder/tests/test_volume.py  2013-09-06 16:12:30.347562596 -0700
 
23
@@ -1663,8 +1663,12 @@
 
24
         volume = tests_utils.create_volume(self.context, size=0,
 
25
                                            host=CONF.host)
26
26
         host_obj = {'host': 'newhost', 'capabilities': {}}
27
27
-        self.volume.migrate_volume(self.context, volume['id'],
28
28
-                                   host_obj, True)