Commit b1509b28 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki Committed by Jérome Perrin

py2/py3: str(class) result is different between Python 2 and 3.

parent c7acbcdd
...@@ -900,7 +900,7 @@ class TestInventoryList(InventoryAPITestCase): ...@@ -900,7 +900,7 @@ class TestInventoryList(InventoryAPITestCase):
getInventoryList = self.getSimulationTool().getInventoryList getInventoryList = self.getSimulationTool().getInventoryList
inventory_list = getInventoryList() inventory_list = getInventoryList()
self.assertEqual(str(inventory_list.__class__), self.assertEqual(str(inventory_list.__class__),
'Shared.DC.ZRDB.Results.Results') 'Shared.DC.ZRDB.Results.Results' if six.PY2 else "<class 'Shared.DC.ZRDB.Results.Results'>")
# the brain is InventoryListBrain # the brain is InventoryListBrain
self.assertIn('InventoryListBrain', self.assertIn('InventoryListBrain',
[c.__name__ for c in inventory_list._class.__bases__]) [c.__name__ for c in inventory_list._class.__bases__])
...@@ -1711,7 +1711,7 @@ class TestMovementHistoryList(InventoryAPITestCase): ...@@ -1711,7 +1711,7 @@ class TestMovementHistoryList(InventoryAPITestCase):
getMovementHistoryList = self.getSimulationTool().getMovementHistoryList getMovementHistoryList = self.getSimulationTool().getMovementHistoryList
mvt_history_list = getMovementHistoryList() mvt_history_list = getMovementHistoryList()
self.assertEqual(str(mvt_history_list.__class__), self.assertEqual(str(mvt_history_list.__class__),
'Shared.DC.ZRDB.Results.Results') 'Shared.DC.ZRDB.Results.Results' if six.PY2 else "<class 'Shared.DC.ZRDB.Results.Results'>")
# default is an empty list # default is an empty list
self.assertEqual(0, len(mvt_history_list)) self.assertEqual(0, len(mvt_history_list))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment