Merge lp:~fgiff/linaro-android-bot-review/873254 into lp:linaro-android-bot-review

[Frans Gifford]

[Frans Gifford (fgiff)]

review: Approve

=== modified file 'gerritconnection.py'
--- gerritconnection.py	2011-10-11 14:50:04 +0000
+++ gerritconnection.py	2011-10-13 14:04:27 +0000
@@ -1,5 +1,7 @@
 import paramiko
 import socket
+import urllib2
+import json
 
 class GerritConnection:
     def __init__(self, ssh_user, review_host, ssh_key_file=None,
@@ -75,6 +77,20 @@
         return reviews
 
 
+    def get_comment_list(self, review):
+        """Use JSON-RPC api to get list of comments for a given review."""
+        url = "http://%s/gerrit/rpc/ChangeDetailService" % self.review_host
+        headers = {"Accept": "application/json,application/jsonrequest",
+            "Content-Type": "application/json; charset=UTF-8"}
+        data = '{"jsonrpc":"2.0","method":"changeDetail","params":[{"id":%s}],"id":1}' % (
+            review)
+        #log.debug("Gerrit request: %s", url)
+        req = urllib2.Request(url, data, headers)
+        resp = urllib2.urlopen(req)
+        # Return just the comment strings.
+        return [m["message"] for m in json.loads(resp.read())["result"]["messages"]]
+
+
     def submit_comment(self,
                        project,
                        sha1,

=== modified file 'tests/testgerritconnection.py'
--- tests/testgerritconnection.py	2011-09-30 08:49:33 +0000
+++ tests/testgerritconnection.py	2011-10-13 14:04:27 +0000
@@ -7,6 +7,8 @@
 import re
 import sys
 import StringIO
+import urllib2
+import urllib2mock
 
 
 datadir = os.path.dirname(__file__) + "/data"
@@ -92,6 +94,14 @@
             self.fail()
 
 
+    def testGet_comment_list(self):
+        urllib2.urlopen = urllib2mock.urlopenMock
+        urllib2mock.urlopenVal = '{"result": {"messages": [{"message": "Message 1"}]}}'
+        #self.gc.review_host = "review.android.git.linaro.org"
+        list = self.gc.get_comment_list("232")
+        self.assertEquals(["Message 1"], list)
+
+
 if __name__ == "__main__":
     unittest.main()