From 5b1da8059b35673784134e2f5fac99b25e4d55ad Mon Sep 17 00:00:00 2001 From: Brindusan Cristian Date: Wed, 22 May 2019 15:47:40 +0300 Subject: [PATCH] Backed out changeset 09df445cbdd9 (bug 1550075) for f8 linting failure at raptor.py:857:10. CLOSED TREE --- testing/profiles/raptor-android/extensions/README.txt | 2 -- testing/profiles/raptor-android/user.js | 5 ----- testing/raptor/raptor/raptor.py | 8 -------- 3 files changed, 15 deletions(-) delete mode 100644 testing/profiles/raptor-android/extensions/README.txt delete mode 100644 testing/profiles/raptor-android/user.js diff --git a/testing/profiles/raptor-android/extensions/README.txt b/testing/profiles/raptor-android/extensions/README.txt deleted file mode 100644 index 9ec618a6aa0f..000000000000 --- a/testing/profiles/raptor-android/extensions/README.txt +++ /dev/null @@ -1,2 +0,0 @@ -Dropping extensions here will get them installed in all test harnesses -that make use of this profile. diff --git a/testing/profiles/raptor-android/user.js b/testing/profiles/raptor-android/user.js deleted file mode 100644 index aa523ba13445..000000000000 --- a/testing/profiles/raptor-android/user.js +++ /dev/null @@ -1,5 +0,0 @@ -// Preferences file used by the raptor harness exclusively on android -/* globals user_pref */ - -// disk cache smart size is enabled in shipped apps -user_pref("browser.cache.disk.smart_size.enabled", true); diff --git a/testing/raptor/raptor/raptor.py b/testing/raptor/raptor/raptor.py index 9575a8996293..52fd1f6d4abb 100644 --- a/testing/raptor/raptor/raptor.py +++ b/testing/raptor/raptor/raptor.py @@ -851,14 +851,6 @@ class RaptorAndroid(Raptor): for key, value in commands.items(): self._set_value_and_check_exitcode(key, value, root=True) - def build_browser_profile(self): - super(RaptorAndroid, self).build_browser_profile() - - # Merge in the android profile - path = os.path.join(self.profile_data_dir, 'raptor-android') - self.log.info("Merging profile: {}".format(path)) - self.profile.merge(path) - def clear_app_data(self): self.log.info("clearing %s app data" % self.config['binary']) self.device.shell("pm clear %s" % self.config['binary'])