make sure everything is sorted in the xmlrpc schema

Author: cmeerw

roundup/xmlrpc.py

@@ -73,7 +73,7 @@ def schema(self):
         s = {}
         for c in self.db.classes:
             cls = self.db.classes[c]
-            props = [(n,repr(v)) for n,v in cls.properties.items()]
+            props = [(n,repr(v)) for n,v in sorted(cls.properties.items())]
             s[c] = props
         return s
 

test/test_xmlrpc.py

@@ -101,48 +101,48 @@ def testFileCreate(self):
         self.assertEqual(results['content'], 'hello\r\nthere')
 
     def testSchema(self):
-        schema={'status': [('order', '<roundup.hyperdb.Number>'),
-                           ('name', '<roundup.hyperdb.String>')],
+        schema={'status': [('name', '<roundup.hyperdb.String>'),
+                           ('order', '<roundup.hyperdb.Number>')],
                 'keyword': [('name', '<roundup.hyperdb.String>')],
-                'priority': [('order', '<roundup.hyperdb.Number>'),
-                             ('name', '<roundup.hyperdb.String>')],
-                'user': [('username', '<roundup.hyperdb.String>'),
+                'priority': [('name', '<roundup.hyperdb.String>'),
+                             ('order', '<roundup.hyperdb.Number>')],
+                'user': [('address', '<roundup.hyperdb.String>'),
                          ('alternate_addresses', '<roundup.hyperdb.String>'),
-                         ('realname', '<roundup.hyperdb.String>'),
-                         ('roles', '<roundup.hyperdb.String>'),
                          ('organisation', '<roundup.hyperdb.String>'),
-                         ('queries', '<roundup.hyperdb.Multilink to "query">'),
+                         ('password', '<roundup.hyperdb.Password>'),
                          ('phone', '<roundup.hyperdb.String>'),
-                         ('address', '<roundup.hyperdb.String>'),
+                         ('queries', '<roundup.hyperdb.Multilink to "query">'),
+                         ('realname', '<roundup.hyperdb.String>'),
+                         ('roles', '<roundup.hyperdb.String>'),
                          ('timezone', '<roundup.hyperdb.String>'),
-                         ('password', '<roundup.hyperdb.Password>')],
+                         ('username', '<roundup.hyperdb.String>')],
                 'file': [('content', '<roundup.hyperdb.String>'),
-                         ('type', '<roundup.hyperdb.String>'),
-                         ('name', '<roundup.hyperdb.String>')],
-                'msg': [('files', '<roundup.hyperdb.Multilink to "file">'),
+                         ('name', '<roundup.hyperdb.String>'),
+                         ('type', '<roundup.hyperdb.String>')],
+                'msg': [('author', '<roundup.hyperdb.Link to "user">'),
+                        ('content', '<roundup.hyperdb.String>'),
+                        ('date', '<roundup.hyperdb.Date>'),
+                        ('files', '<roundup.hyperdb.Multilink to "file">'),
                         ('inreplyto', '<roundup.hyperdb.String>'),
-                        ('tx_Source', '<roundup.hyperdb.String>'),
+                        ('messageid', '<roundup.hyperdb.String>'),
                         ('recipients', '<roundup.hyperdb.Multilink to "user">'),
-                        ('author', '<roundup.hyperdb.Link to "user">'),
                         ('summary', '<roundup.hyperdb.String>'),
-                        ('content', '<roundup.hyperdb.String>'),
-                        ('messageid', '<roundup.hyperdb.String>'),
-                        ('date', '<roundup.hyperdb.Date>'),
+                        ('tx_Source', '<roundup.hyperdb.String>'),
                         ('type', '<roundup.hyperdb.String>')],
-                'query': [('url', '<roundup.hyperdb.String>'),
-                          ('private_for', '<roundup.hyperdb.Link to "user">'),
+                'query': [('klass', '<roundup.hyperdb.String>'),
                           ('name', '<roundup.hyperdb.String>'),
-                          ('klass', '<roundup.hyperdb.String>')],
-                'issue': [('status', '<roundup.hyperdb.Link to "status">'),
+                          ('private_for', '<roundup.hyperdb.Link to "user">'),
+                          ('url', '<roundup.hyperdb.String>')],
+                'issue': [('assignedto', '<roundup.hyperdb.Link to "user">'),
                           ('files', '<roundup.hyperdb.Multilink to "file">'),
-                          ('tx_Source', '<roundup.hyperdb.String>'),
                           ('keyword', '<roundup.hyperdb.Multilink to "keyword">'),
-                          ('title', '<roundup.hyperdb.String>'),
-                          ('nosy', '<roundup.hyperdb.Multilink to "user">'),
                           ('messages', '<roundup.hyperdb.Multilink to "msg">'), 
+                          ('nosy', '<roundup.hyperdb.Multilink to "user">'),
                           ('priority', '<roundup.hyperdb.Link to "priority">'),
-                          ('assignedto', '<roundup.hyperdb.Link to "user">'),
-                          ('superseder', '<roundup.hyperdb.Multilink to "issue">')]}
+                          ('status', '<roundup.hyperdb.Link to "status">'),
+                          ('superseder', '<roundup.hyperdb.Multilink to "issue">'),
+                          ('title', '<roundup.hyperdb.String>'),
+                          ('tx_Source', '<roundup.hyperdb.String>')]}
 
         results = self.server.schema()
         self.assertEqual(results, schema)