diff --git a/certsuite/adb_b2g.py b/certsuite/adb_b2g.py index d0495382..f2132460 100644 --- a/certsuite/adb_b2g.py +++ b/certsuite/adb_b2g.py @@ -169,6 +169,11 @@ def prefs_modified(): def inner(): try: + # add checking adbd's user, if it's not root, then give a command adb root to restart adbd as root user + adbd_process = self.shell_output("ps|grep adbd") + if "root" not in adbd_process: + self._logger.info("Restart adbd running as root user") + os.system("adb root") listing = self.shell_output("ls -l %s" % (prefs_file)) mode, user, group, size, date, time, name = listing.split(None, 6) mtime = "%s %s" % (date, time) diff --git a/certsuite/harness.py b/certsuite/harness.py index 549a9755..39bbeb0c 100644 --- a/certsuite/harness.py +++ b/certsuite/harness.py @@ -360,6 +360,8 @@ def check_root(device): have_root = user == "root" if not have_root: logger.critical("adbd running as non-root user %s" % user) + logger.critical("Restart adbd running as root user") + os.system("adb root") break if not have_adbd: logger.critical("adbd process not found") diff --git a/requirements.txt b/requirements.txt index 76b174ac..d26b7620 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,18 @@ -fxos-appgen >= 0.11 +fxos-appgen == 0.13 gaiatest == 0.26 marionette_client == 0.7.10 -marionette_extension >= 0.4.7 -mozdevice >= 0.41 -mozlog >= 2.1 -moznetwork >= 0.24 -mozprocess >= 0.18 -mozprofile >= 0.21 -mozrunner >= 6.1 -moztest >= 0.6 +marionette_extension == 0.4.8 +mozdevice == 0.45 +mozlog == 2.11 +moznetwork == 0.26 +mozprocess == 0.22 +mozprofile == 0.24 +mozrunner == 6.7 +moztest == 0.7 +mozcrash == 0.14 +mozversion == 1.2 py == 1.4.20 sphinx -tornado >= 3.2 -wptrunner >= 1.4 -wptserve >= 1.0.1 +tornado == 4.2 +wptrunner == 1.14 +wptserve == 1.3.0