Merge "Ensure list_with_limit tests pass"
diff --git a/ironic_tempest_plugin/tests/api/admin/test_allocations.py b/ironic_tempest_plugin/tests/api/admin/test_allocations.py
index 1891a3b..4e48374 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_allocations.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_allocations.py
@@ -133,7 +133,10 @@
_, body = self.client.create_allocation(self.resource_class,
name='banana')
_, loaded_body = self.client.show_allocation('banana')
- self._assertExpected(body, loaded_body)
+ # The allocation will likely have been processed by this time, so do
+ # not compare the whole body.
+ for field in ('name', 'uuid', 'resource_class'):
+ self.assertEqual(body[field], loaded_body[field])
@decorators.idempotent_id('4ca123c4-160d-4d8d-a3f7-15feda812263')
def test_list_allocations(self):
diff --git a/ironic_tempest_plugin/tests/scenario/introspection_manager.py b/ironic_tempest_plugin/tests/scenario/introspection_manager.py
index 21b9911..d39e0a7 100644
--- a/ironic_tempest_plugin/tests/scenario/introspection_manager.py
+++ b/ironic_tempest_plugin/tests/scenario/introspection_manager.py
@@ -10,10 +10,11 @@
# License for the specific language governing permissions and limitations
# under the License.
-import json
import os
import time
+from oslo_serialization import jsonutils as json
+
import six
import tempest
from tempest import config