commit c4d1c83c1efa477624faa54a50acdac850c61341
author Mark Goddard <mark@stackhpc.com> Sun Jan 28 18:42:34 2018 +0000
committer Mark Goddard <mark@stackhpc.com> Tue Jan 30 15:32:54 2018 +0000
tree 9d0373020a767510d368830e77ae63b7d5d69269
parent bcdb740e5d40e3dedfc73a1e6fe6b80585621fc2

Sort node traits in comparisons

Don't assume that node traits in API responses will be sorted. While
this seems to be the case with mysql, it is not guaranteed for
postgresql.

Change-Id: I8f2afe6a3194203230e3f1cd2fee22190ff3be9f
Partial-Bug: #1722194

ironic_tempest_plugin/tests/api/admin/test_nodes.py

diff --git a/ironic_tempest_plugin/tests/api/admin/test_nodes.py b/ironic_tempest_plugin/tests/api/admin/test_nodes.py
index b9e4d39..75a17ec 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_nodes.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_nodes.py
@@ -427,7 +427,7 @@
 
         self.client.set_node_traits(self.node['uuid'], self.traits)
         _, body = self.client.list_node_traits(self.node['uuid'])
-        self.assertEqual(self.traits, body['traits'])
+        self.assertEqual(self.traits, sorted(body['traits']))
 
     @decorators.attr(type='negative')
     @decorators.idempotent_id('3b83dbd3-4a89-4173-920a-ca33ed3aad69')
@@ -444,7 +444,7 @@
         self.client.set_node_traits(self.node['uuid'], self.traits)
 
         _, body = self.client.list_node_traits(self.node['uuid'])
-        self.assertEqual(self.traits, body['traits'])
+        self.assertEqual(self.traits, sorted(body['traits']))
 
         self.client.set_node_traits(self.node['uuid'], [])
 
@@ -608,7 +608,7 @@
         for node in body['nodes']:
             self.assertIn('traits', node)
             if node['uuid'] == self.node['uuid']:
-                self.assertEqual(self.traits, node['traits'])
+                self.assertEqual(self.traits, sorted(node['traits']))
 
     @decorators.idempotent_id('2b82f704-1580-403a-af92-92c29a7eebb7')
     def test_list_nodes_traits_field(self):
@@ -621,7 +621,7 @@
         for node in body['nodes']:
             self.assertIn('traits', node)
             if node['uuid'] == self.node['uuid']:
-                self.assertEqual(self.traits, node['traits'])
+                self.assertEqual(self.traits, sorted(node['traits']))
 
     @decorators.idempotent_id('c83c537a-76aa-4d8a-8673-128d01ee403d')
     def test_show_node(self):
@@ -631,7 +631,7 @@
         _, body = self.client.show_node(self.node['uuid'])
 
         self.assertIn('traits', body)
-        self.assertEqual(self.traits, body['traits'])
+        self.assertEqual(self.traits, sorted(body['traits']))
 
     @decorators.attr(type='negative')
     @decorators.idempotent_id('9ab6a19c-83b9-4600-b55b-325a51e2f8f6')