From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 14 Aug 2015 22:11:49 +0000 (+0000)
Subject: Merge "Validate name and description string"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=edd25e46880df017d17822d01d9d0463b0654ac5;p=openstack-build%2Fcinder-build.git

Merge "Validate name and description string"
---

edd25e46880df017d17822d01d9d0463b0654ac5
diff --cc cinder/tests/unit/api/contrib/test_backups.py
index b58021782,033d33aac..e1f335e9b
--- a/cinder/tests/unit/api/contrib/test_backups.py
+++ b/cinder/tests/unit/api/contrib/test_backups.py
@@@ -400,9 -403,10 +403,10 @@@ class BackupsAPITestCase(test.TestCase)
  
          res_dict = json.loads(res.body)
  
 -        self.assertEqual(res.status_int, 202)
 +        self.assertEqual(202, res.status_int)
          self.assertIn('id', res_dict['backup'])
          self.assertTrue(_mock_service_get_all_by_topic.called)
+         self.assertTrue(mock_validate.called)
  
          db.volume_destroy(context.get_admin_context(), volume_id)
  
@@@ -492,9 -499,10 +499,10 @@@
          res = req.get_response(fakes.wsgi_app())
  
          res_dict = json.loads(res.body)
 -        self.assertEqual(res.status_int, 202)
 +        self.assertEqual(202, res.status_int)
          self.assertIn('id', res_dict['backup'])
          self.assertTrue(_mock_service_get_all_by_topic.called)
+         self.assertTrue(mock_validate.called)
  
          db.volume_destroy(context.get_admin_context(), volume_id)