merge patch for fixing CSVExport function tests. Problem caused by unstable ordering of the nosy list

Author: rouilj

roundup/cgi/actions.py

@@ -1364,6 +1364,9 @@ def fct(arg):
                     return ""
                 elif type(arg) is list:
                     seq = [str(cls.get(val, col)) for val in arg]
+                    # python2/python 3 have different order in lists
+                    # sort to not break tests
+                    seq.sort()
                     return self.list_sep.join(seq)
             return fct
         def repr_date():
@@ -1520,7 +1523,14 @@ def handle(self):
                     raise exceptions.Unauthorised(self._(
                         'You do not have permission to view %(class)s'
                     ) % {'class': request.classname})
-                row.append(str(klass.get(itemid, name)))
+                value = klass.get(itemid, name)
+                try:
+                    # python2/python 3 have different order in lists
+                    # sort to not break tests
+                    value.sort()
+                except AttributeError:
+                    pass  # value is not sortable, probably str
+                row.append(str(value))
             self.client._socket_op(writer.writerow, row)
 
         return '\n'

test/test_cgi.py

@@ -1525,20 +1525,21 @@ def testCSVExport(self):
         # call export version that outputs names
         actions.ExportCSVAction(cl).handle()
         #print(output.getvalue())
-        self.assertEquals('id,title,status,keyword,assignedto,nosy\r\n'
-'1,foo1,deferred,,"Contrary, Mary","Bork, Chef;demo;Contrary, Mary"\r\n'
-'2,bar2,unread,keyword1;keyword2,"Bork, Chef","Bork, Chef"\r\n'
-'3,baz32,need-eg,,,\r\n',
-
-            output.getvalue())
+        should_be=('id,title,status,keyword,assignedto,nosy\r\n'
+                   '1,foo1,deferred,,"Contrary, Mary","Bork, Chef;Contrary, Mary;demo"\r\n'
+                   '2,bar2,unread,keyword1;keyword2,"Bork, Chef","Bork, Chef"\r\n'
+                   '3,baz32,need-eg,,,\r\n')
+        #print(should_be)
+        #print(output.getvalue())
+        self.assertEqual(output.getvalue(), should_be)
         output = StringIO()
         cl.request = MockNull()
         cl.request.wfile = output
         # call export version that outputs id numbers
         actions.ExportCSVWithIdAction(cl).handle()
-        #print(output.getvalue())
+        print(output.getvalue())
         self.assertEquals('id,title,status,keyword,assignedto,nosy\r\n'
-                          "1,foo1,2,[],4,\"['3', '5', '4']\"\r\n"
+                          "1,foo1,2,[],4,\"['3', '4', '5']\"\r\n"
                           "2,bar2,1,\"['1', '2']\",3,['3']\r\n"
                           '3,baz32,4,[],None,[]\r\n',
             output.getvalue())