From 78d1a2400d0cf923cfa737cff59d6c9951dbe314 Mon Sep 17 00:00:00 2001 From: Terry Howe Date: Fri, 17 Feb 2017 07:44:34 -0700 Subject: [PATCH] Fix function test for compute images The functional test for compute image metadata did not expect to get anything back for some reason. Partial-bug: #1665495 Change-Id: If2d0e0a402bf4fc530187ec07dfd3f69057104bf --- openstack/tests/functional/compute/v2/test_image.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/openstack/tests/functional/compute/v2/test_image.py b/openstack/tests/functional/compute/v2/test_image.py index 09069d69..d71f30d7 100644 --- a/openstack/tests/functional/compute/v2/test_image.py +++ b/openstack/tests/functional/compute/v2/test_image.py @@ -73,13 +73,14 @@ class TestImage(base.BaseFunctionalTest): # set empty metadata self.conn.compute.set_image_metadata(image, k0='') image = self.conn.compute.get_image_metadata(image) - self.assertFalse(image.metadata) + self.assertIn('k0', image.metadata) + self.assertEqual('', image.metadata['k0']) # set metadata self.conn.compute.set_image_metadata(image, k1='v1') image = self.conn.compute.get_image_metadata(image) self.assertTrue(image.metadata) - self.assertEqual(1, len(image.metadata)) + self.assertEqual(2, len(image.metadata)) self.assertIn('k1', image.metadata) self.assertEqual('v1', image.metadata['k1']) @@ -87,7 +88,7 @@ class TestImage(base.BaseFunctionalTest): self.conn.compute.set_image_metadata(image, k2='v2') image = self.conn.compute.get_image_metadata(image) self.assertTrue(image.metadata) - self.assertEqual(2, len(image.metadata)) + self.assertEqual(3, len(image.metadata)) self.assertIn('k1', image.metadata) self.assertEqual('v1', image.metadata['k1']) self.assertIn('k2', image.metadata) @@ -97,7 +98,7 @@ class TestImage(base.BaseFunctionalTest): self.conn.compute.set_image_metadata(image, k1='v1.1') image = self.conn.compute.get_image_metadata(image) self.assertTrue(image.metadata) - self.assertEqual(2, len(image.metadata)) + self.assertEqual(3, len(image.metadata)) self.assertIn('k1', image.metadata) self.assertEqual('v1.1', image.metadata['k1']) self.assertIn('k2', image.metadata)