Mercurial > p > roundup > code
changeset 5504:7f3dfdd6a620
make sure everything is sorted in the xmlrpc schema
| author | Christof Meerwald <cmeerw@cmeerw.org> |
|---|---|
| date | Thu, 16 Aug 2018 20:34:42 +0100 |
| parents | 4f6e1ce89557 |
| children | 2ce41b8dffaf |
| files | roundup/xmlrpc.py test/test_xmlrpc.py |
| diffstat | 2 files changed, 29 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/roundup/xmlrpc.py Thu Aug 16 20:14:09 2018 +0100 +++ b/roundup/xmlrpc.py Thu Aug 16 20:34:42 2018 +0100 @@ -73,7 +73,7 @@ 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
--- a/test/test_xmlrpc.py Thu Aug 16 20:14:09 2018 +0100 +++ b/test/test_xmlrpc.py Thu Aug 16 20:34:42 2018 +0100 @@ -101,48 +101,48 @@ 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>'), + ('organisation', '<roundup.hyperdb.String>'), + ('password', '<roundup.hyperdb.Password>'), + ('phone', '<roundup.hyperdb.String>'), + ('queries', '<roundup.hyperdb.Multilink to "query">'), ('realname', '<roundup.hyperdb.String>'), ('roles', '<roundup.hyperdb.String>'), - ('organisation', '<roundup.hyperdb.String>'), - ('queries', '<roundup.hyperdb.Multilink to "query">'), - ('phone', '<roundup.hyperdb.String>'), - ('address', '<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>'), - ('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>'), + ('recipients', '<roundup.hyperdb.Multilink to "user">'), + ('summary', '<roundup.hyperdb.String>'), + ('tx_Source', '<roundup.hyperdb.String>'), ('type', '<roundup.hyperdb.String>')], - 'query': [('url', '<roundup.hyperdb.String>'), + 'query': [('klass', '<roundup.hyperdb.String>'), + ('name', '<roundup.hyperdb.String>'), ('private_for', '<roundup.hyperdb.Link to "user">'), - ('name', '<roundup.hyperdb.String>'), - ('klass', '<roundup.hyperdb.String>')], - 'issue': [('status', '<roundup.hyperdb.Link to "status">'), + ('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>'), + ('messages', '<roundup.hyperdb.Multilink to "msg">'), ('nosy', '<roundup.hyperdb.Multilink to "user">'), - ('messages', '<roundup.hyperdb.Multilink to "msg">'), ('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)