Bug 1256978. Use self.capabilities instead of self._capabilities in BaseMarionetteTestRunner; r=maja_zf
authorNathalie Rud <nathalier@gmail.com>
Wed, 16 Mar 2016 01:40:21 +0200
changeset 289284 5a19d947e01681b6a41ae0d84bf1e95daef6feb8
parent 289283 3dbf442cca6ece3975f0f7600fa34229fe55e97b
child 289285 059094bbd0b80ef8ef3b1c9892c92324b847a291
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmaja_zf
bugs1256978
milestone48.0a1
Bug 1256978. Use self.capabilities instead of self._capabilities in BaseMarionetteTestRunner; r=maja_zf MozReview-Commit-ID: 9ZCOLKae6rt
testing/marionette/harness/marionette/runner/base.py
--- a/testing/marionette/harness/marionette/runner/base.py
+++ b/testing/marionette/harness/marionette/runner/base.py
@@ -803,22 +803,19 @@ setReq.onerror = function() {
 
     def run_tests(self, tests):
         self.reset_test_stats()
         self.start_time = time.time()
 
         need_external_ip = True
         if not self.marionette:
             self.start_marionette()
-            # Retrieve capabilities for later use
-            if not self._capabilities:
-                self.capabilities
             # if we're working against a desktop version, we usually don't need
             # an external ip
-            if self._capabilities['device'] == "desktop":
+            if self.capabilities['device'] == "desktop":
                 need_external_ip = False
         self.logger.info('Initial Profile Destination is '
                          '"{}"'.format(self.marionette.profile_path))
 
         # Gaia sets server_root and that means we shouldn't spin up our own httpd
         if not self.httpd:
             if self.server_root is None or os.path.isdir(self.server_root):
                 self.logger.info("starting httpd")