Port test_cache_manage to Python 3

* Decode HTTP body from UTF-8 to get Unicode on Python 3. The test
  still works on Python 2.
* tox.ini: add test_cache_manage to Python 3.4.

Change-Id: I637732cb06b7ae30853b35d2a83aa85f643fd43b
This commit is contained in:
Victor Stinner 2015-10-19 19:27:52 +02:00
parent b9aaa2f39e
commit 641cef92e1
2 changed files with 15 additions and 7 deletions
glance/tests/unit/api/middleware
tox.ini

@ -58,7 +58,8 @@ class TestCacheManageFilter(test_utils.BaseTestCase):
# check
mock_get_cached_images.assert_called_with(request)
self.assertEqual('"' + self.stub_value + '"', resource.body)
self.assertEqual('"' + self.stub_value + '"',
resource.body.decode('utf-8'))
@mock.patch.object(cached_images.Controller, "delete_cached_image")
def test_delete_cached_image(self,
@ -76,7 +77,8 @@ class TestCacheManageFilter(test_utils.BaseTestCase):
# check
mock_delete_cached_image.assert_called_with(request,
image_id=self.image_id)
self.assertEqual('"' + self.stub_value + '"', resource.body)
self.assertEqual('"' + self.stub_value + '"',
resource.body.decode('utf-8'))
@mock.patch.object(cached_images.Controller, "delete_cached_images")
def test_delete_cached_images(self,
@ -93,7 +95,8 @@ class TestCacheManageFilter(test_utils.BaseTestCase):
# check
mock_delete_cached_images.assert_called_with(request)
self.assertEqual('"' + self.stub_value + '"', resource.body)
self.assertEqual('"' + self.stub_value + '"',
resource.body.decode('utf-8'))
@mock.patch.object(cached_images.Controller, "queue_image")
def test_put_queued_image(self,
@ -110,7 +113,8 @@ class TestCacheManageFilter(test_utils.BaseTestCase):
# check
mock_queue_image.assert_called_with(request, image_id=self.image_id)
self.assertEqual('"' + self.stub_value + '"', resource.body)
self.assertEqual('"' + self.stub_value + '"',
resource.body.decode('utf-8'))
@mock.patch.object(cached_images.Controller, "get_queued_images")
def test_get_queued_images(self,
@ -126,7 +130,8 @@ class TestCacheManageFilter(test_utils.BaseTestCase):
# check
mock_get_queued_images.assert_called_with(request)
self.assertEqual('"' + self.stub_value + '"', resource.body)
self.assertEqual('"' + self.stub_value + '"',
resource.body.decode('utf-8'))
@mock.patch.object(cached_images.Controller, "delete_queued_image")
def test_delete_queued_image(self,
@ -144,7 +149,8 @@ class TestCacheManageFilter(test_utils.BaseTestCase):
# check
mock_delete_queued_image.assert_called_with(request,
image_id=self.image_id)
self.assertEqual('"' + self.stub_value + '"', resource.body)
self.assertEqual('"' + self.stub_value + '"',
resource.body.decode('utf-8'))
@mock.patch.object(cached_images.Controller, "delete_queued_images")
def test_delete_queued_images(self,
@ -161,4 +167,5 @@ class TestCacheManageFilter(test_utils.BaseTestCase):
# check
mock_delete_queued_images.assert_called_with(request)
self.assertEqual('"' + self.stub_value + '"', resource.body)
self.assertEqual('"' + self.stub_value + '"',
resource.body.decode('utf-8'))

@ -18,6 +18,7 @@ downloadcache = ~/cache/pip
[testenv:py34]
commands =
python -m testtools.run \
glance.tests.unit.api.middleware.test_cache_manage \
glance.tests.unit.api.test_cmd \
glance.tests.unit.api.test_cmd_cache_manage \
glance.tests.unit.api.test_common \