Merge tardyp/buildbot:restreg (PR #1602)

(with addition of a space)
buildbot · Mar 17, 2015 · 02195a3 · 02195a3
2 parents 48c8bca + 5117b02
commit 02195a3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/master/buildbot/data/base.py b/master/buildbot/data/base.py
@@ -88,6 +88,9 @@ def control(self, action, args, kwargs):
     def startConsuming(self, callback, options, kwargs):
         raise NotImplementedError
 
+    def __repr__(self):
+        return "endpoint for " + self.pathPatterns
+
 
 class BuildNestingMixin(object):
 

diff --git a/master/buildbot/data/resultspec.py b/master/buildbot/data/resultspec.py
@@ -75,6 +75,10 @@ def __init__(self, filters=None, fields=None, order=None,
         self.limit = limit
         self.offset = offset
 
+    def __repr__(self):
+        return "ResultSpec(**" + repr(dict(filters=self.filters, fields=self.fields, order=self.order,
+                                           limit=self.limit, offset=self.offset)) + ")"
+
     def popFilter(self, field, op):
         for f in self.filters:
             if f.field == field and f.op == op:

diff --git a/master/buildbot/test/unit/test_www_rest.py b/master/buildbot/test/unit/test_www_rest.py
@@ -452,7 +452,9 @@ def test_api_details(self):
     def test_api_details_none(self):
         yield self.render_resource(self.rsrc, '/test/0')
         self.assertRequest(
-            contentJson=dict(error="not found"),
+            contentJson=dict(error="not found while getting from endpoint for /test/n:testid with arguments"
+                             " ResultSpec(**{'fields': None, 'limit': None, 'order': None, 'filters': [], "
+                             "'offset': None}) and {'testid': 0}"),
             contentType='text/plain; charset=utf-8',
             responseCode=404)
 

diff --git a/master/buildbot/www/rest.py b/master/buildbot/www/rest.py
@@ -308,9 +308,9 @@ def writeError(msg, errcode=404, jsonrpccode=None):
             rspec = self.decodeResultSpec(request, ep)
             data = yield ep.get(rspec, kwargs)
             if data is None:
-                writeError(("not found while getting from endpoint %s with "
-                            "arguments %s and %s") % (str(ep), str(rspec),
-                            str(kwargs)), errcode=404)
+                writeError(("not found while getting from %s with "
+                            "arguments %s and %s") % (repr(ep), repr(rspec),
+                                                      str(kwargs)), errcode=404)
                 return
 
             if ep.isRaw: