Merge pull request #30986 from mwargers/1174892_v2.2

Bug 1174892 - Gaiatest needs to be updated for treeherder client changes, v2.2 version

tests/python/gaia-ui-tests/gaiatest/mixins/treeherder.py

@@ -17,7 +17,7 @@
 from mozlog.structured.handlers import LogLevelFilter, StreamHandler
 import mozversion
 import requests
-from thclient import TreeherderRequest, TreeherderJobCollection
+from thclient import TreeherderClient, TreeherderJobCollection
 
 # The device_group_map maps by device name then
 # device_firmware_version_release to denote the underlying Android version
@@ -246,17 +246,11 @@ def post_to_treeherder(self, tests):
 
         # Send the collection to Treeherder
         url = urlparse(self.treeherder_url)
-        request = TreeherderRequest(
-            protocol=url.scheme,
-            host=url.hostname,
-            project=project,
-            oauth_key=os.environ.get('TREEHERDER_KEY'),
-            oauth_secret=os.environ.get('TREEHERDER_SECRET'))
+        client = TreeherderClient(protocol=url.scheme, host=url.hostname)
         self.logger.debug('Sending results to Treeherder: %s' %
                           job_collection.to_json())
-        response = request.post(job_collection)
-        self.logger.debug('Response: %s' % response.read())
-        assert response.status == 200, 'Failed to send results!'
+        client.post_collection(project, os.environ.get('TREEHERDER_KEY'),
+            os.environ.get('TREEHERDER_SECRET'), job_collection)
         self.logger.info('Results are available to view at: %s' % (
             urljoin(self.treeherder_url, '/ui/#/jobs?repo=%s&revision=%s' % (
                 project, revision))))

tests/python/gaia-ui-tests/requirements.txt

@@ -3,4 +3,4 @@ marionette_client-mozilla-b2g37_v2_2
 mozdevice>=0.34
 moztest>=0.6
 requests
-treeherder-client==1.0
+treeherder-client==1.5