Bug 1533517 - [mozdevice] Remove FirefoxOS candidate test root paths. r=bc
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 12 Mar 2019 13:55:51 +0000
changeset 521527 1aa0df07fbdd
parent 521526 8f87d52ffc92
child 521528 4e5dbbdb10f3
push id10867
push userdvarga@mozilla.com
push dateThu, 14 Mar 2019 15:20:45 +0000
treeherdermozilla-beta@abad13547875 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbc
bugs1533517
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1533517 - [mozdevice] Remove FirefoxOS candidate test root paths. r=bc Differential Revision: https://phabricator.services.mozilla.com/D22952
testing/marionette/harness/requirements.txt
testing/mozbase/mozdevice/mozdevice/adb.py
testing/mozbase/mozdevice/setup.py
testing/mozbase/mozrunner/setup.py
testing/raptor/requirements.txt
--- a/testing/marionette/harness/requirements.txt
+++ b/testing/marionette/harness/requirements.txt
@@ -1,13 +1,13 @@
 browsermob-proxy >= 0.8.0
 manifestparser >= 1.1
 marionette-driver >= 2.8.0
 mozcrash >= 1.1.0
-mozdevice >= 3.0.0
+mozdevice >= 3.0.1
 mozinfo >= 1.0.0
 mozlog >= 4.0
 moznetwork >= 0.27
 mozprocess >= 1.0.0
 mozprofile >= 2.2.0
 mozrunner >= 7.4.0
 moztest >= 0.8
 mozversion >= 2.1.0
--- a/testing/mozbase/mozdevice/mozdevice/adb.py
+++ b/testing/mozbase/mozdevice/mozdevice/adb.py
@@ -964,18 +964,16 @@ class ADBDevice(ADBCommand):
         The first time test_root it is called it determines and caches a value
         for the test root on the device. It determines the appropriate test
         root by attempting to create a 'dummy' directory on each of a list of
         directories and returning the first successful directory as the
         test_root value.
 
         The default list of directories checked by test_root are:
 
-        - /storage/sdcard0/tests
-        - /storage/sdcard1/tests
         - /sdcard/tests
         - /mnt/sdcard/tests
         - /data/local/tests
 
         You may override the default list by providing a test_root argument to
         the :class:`ADBDevice` constructor which will then be used when
         attempting to create the 'dummy' directory.
 
@@ -984,19 +982,17 @@ class ADBDevice(ADBCommand):
                  * ADBError
         """
         if self._test_root is not None:
             return self._test_root
 
         if self._initial_test_root:
             paths = [self._initial_test_root]
         else:
-            paths = ['/storage/sdcard0/tests',
-                     '/storage/sdcard1/tests',
-                     '/sdcard/tests',
+            paths = ['/sdcard/tests',
                      '/mnt/sdcard/tests',
                      '/data/local/tests']
 
         max_attempts = 3
         for attempt in range(1, max_attempts + 1):
             for test_root in paths:
                 self._logger.debug("Setting test root to %s attempt %d of %d" %
                                    (test_root, attempt, max_attempts))
--- a/testing/mozbase/mozdevice/setup.py
+++ b/testing/mozbase/mozdevice/setup.py
@@ -3,17 +3,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from __future__ import absolute_import
 
 from setuptools import setup
 
 PACKAGE_NAME = 'mozdevice'
-PACKAGE_VERSION = '3.0.0'
+PACKAGE_VERSION = '3.0.1'
 
 deps = ['mozlog >= 3.0']
 
 setup(name=PACKAGE_NAME,
       version=PACKAGE_VERSION,
       description="Mozilla-authored device management",
       long_description="see https://firefox-source-docs.mozilla.org/mozbase/index.html",
       classifiers=['Programming Language :: Python :: 2.7',
--- a/testing/mozbase/mozrunner/setup.py
+++ b/testing/mozbase/mozrunner/setup.py
@@ -7,17 +7,17 @@ from __future__ import absolute_import
 from setuptools import setup, find_packages
 
 PACKAGE_NAME = 'mozrunner'
 PACKAGE_VERSION = '7.4.0'
 
 desc = """Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)"""
 
 deps = [
-    'mozdevice>=1.1.6',
+    'mozdevice>=3.0.1',
     'mozfile>=1.2',
     'mozinfo>=0.7,<2',
     'mozlog~=4.0',
     'mozprocess>=0.23,<2',
     'mozprofile~=2.1',
     'six>=1.10.0,<2',
 ]
 
--- a/testing/raptor/requirements.txt
+++ b/testing/raptor/requirements.txt
@@ -1,7 +1,7 @@
 mozcrash ~= 1.0
 mozrunner ~= 7.0
 mozprofile ~= 2.1
 manifestparser >= 1.1
 wptserve ~= 1.4.0
-mozdevice >= 1.1.6
+mozdevice >= 3.0.1
 mozproxy >= 1.0