Merge "Fix order of arguments in assertEqual"

diff --cc cinder/tests/unit/api/contrib/test_backups.py
Simple merge

diff --cc cinder/tests/unit/api/test_common.py
Simple merge

diff --cc cinder/tests/unit/api/v2/test_limits.py
Simple merge

diff --cc cinder/tests/unit/api/v2/test_volumes.py
index d30f8308d287e0ae50101a6fb71cbac7e01bf18f,f24d0b2b9f8f6d7c606210a7ec33ea5cb65b61a0..839a19505b60ba974331732118a9b8915ba2b00b
--- 1/cinder/tests/unit/api/v2/test_volumes.py
--- 2/cinder/tests/unit/api/v2/test_volumes.py
+++ b/cinder/tests/unit/api/v2/test_volumes.py
@@@ -100,8 -111,38 +100,8 @@@ class VolumeApiTest(test.TestCase)
                           'user_id': 'fakeuser',
                           'volume_type': 'vol_type_name',
                           'encrypted': False}}
-         self.assertEqual(res_dict, ex)
+         self.assertEqual(ex, res_dict)
  
 -    def test_volume_create_with_consistencygroup_invalid_type(self):
 -        ctxt = context.RequestContext('fake', 'fake', auth_token=True)
 -        vol_type = db.volume_type_create(
 -            context.get_admin_context(),
 -            dict(name=CONF.default_volume_type, extra_specs={})
 -        )
 -        db_vol_type = db.volume_type_get(context.get_admin_context(),
 -                                         vol_type.id)
 -        cg = {
 -            'id': '1',
 -            'name': 'cg1',
 -            'volume_type_id': db_vol_type['id'],
 -        }
 -        fake_type = {
 -            'id': '9999',
 -            'name': 'fake',
 -        }
 -        vol_api = volume_api.API()
 -
 -        self.assertRaises(exception.InvalidInput,
 -                          vol_api.create,
 -                          ctxt, 1, 'vol1', 'volume 1',
 -                          consistencygroup=cg)
 -
 -        self.assertRaises(exception.InvalidInput,
 -                          vol_api.create,
 -                          ctxt, 1, 'vol1', 'volume 1',
 -                          volume_type=fake_type,
 -                          consistencygroup=cg)
 -
      def test_volume_create_with_type(self):
          vol_type = db.volume_type_create(
              context.get_admin_context(),

diff --cc cinder/tests/unit/image/test_glance.py
Simple merge

diff --cc cinder/tests/unit/test_db_api.py
Simple merge

diff --cc cinder/tests/unit/test_nfs.py
Simple merge

diff --cc cinder/tests/unit/test_quota.py
Simple merge

diff --cc cinder/tests/unit/test_service.py
Simple merge

diff --cc cinder/tests/unit/test_volume_rpcapi.py
Simple merge

diff --cc cinder/tests/unit/test_volume_types.py
Simple merge

diff --cc cinder/tests/unit/test_volume_utils.py
Simple merge