py33: align the order of parameters for urlencode()

In Python 3.3, hash randomization is enabled by default. It causes the
iteration order of dicts and sets to be unpredictable and differ across
Python runs.

In the test case, the fixed expecting string will not match the test
result, it is relying on the dict order.

This change transforms the input dict to a sequence of two-element list,
with fixed order, and update the related expecitng string in test case.

Close-Bug #1234438

Change-Id: Ic7846279a9f508a856cd4ee70408d537088792f2

novaclient/tests/v1_1/test_servers.py

@@ -26,7 +26,7 @@ class ServersTest(utils.TestCase):
 
     def test_list_servers_with_marker_limit(self):
         sl = cs.servers.list(marker=1234, limit=2)
-        cs.assert_called('GET', '/servers/detail?marker=1234&limit=2')
+        cs.assert_called('GET', '/servers/detail?limit=2&marker=1234')
         for s in sl:
             self.assertTrue(isinstance(s, servers.Server))
 

novaclient/v1_1/servers.py

@@ -414,7 +414,13 @@ class ServerManager(base.BootingManagerWithFind):
         if limit:
             qparams['limit'] = limit
 
-        query_string = "?%s" % urlutils.urlencode(qparams) if qparams else ""
+        # Transform the dict to a sequence of two-element tuples in fixed
+        # order, then the encoded string will be consistent in Python 2&3.
+        if qparams:
+            new_qparams = sorted(qparams.items(), key=lambda x: x[0])
+            query_string = "?%s" % urlutils.urlencode(new_qparams)
+        else:
+            query_string = ""
 
         detail = ""
         if detailed: