diff --git a/testing/awsy/awsy/test_base_memory_usage.py b/testing/awsy/awsy/test_base_memory_usage.py index c7b3902a73d9..02f6d06c3bb3 100644 --- a/testing/awsy/awsy/test_base_memory_usage.py +++ b/testing/awsy/awsy/test_base_memory_usage.py @@ -81,8 +81,6 @@ class TestMemoryUsage(AwsyTestCase): self.open_pages() self.settle() self.settle() - self.settle() - self.settle() self.assertTrue(self.do_full_gc()) self.settle() create_checkpoint("TabsOpenForceGC", itr) diff --git a/testing/awsy/conf/base-testvars.json b/testing/awsy/conf/base-testvars.json new file mode 100644 index 000000000000..801fc5243035 --- /dev/null +++ b/testing/awsy/conf/base-testvars.json @@ -0,0 +1,6 @@ +{ + "entities": 4, + "iterations": 1, + "perTabPause": 10, + "settleWaitTime": 60 +} diff --git a/testing/mozharness/scripts/awsy_script.py b/testing/mozharness/scripts/awsy_script.py index a74d65023e6d..7d0a56906b16 100644 --- a/testing/mozharness/scripts/awsy_script.py +++ b/testing/mozharness/scripts/awsy_script.py @@ -157,7 +157,12 @@ class AWSY(TestingMixin, MercurialScript, BlobUploadMixin, TooltoolMixin, CodeCo runtime_testvars_file.close() cmd = ['marionette'] - cmd.append("--testvars=%s" % os.path.join(self.awsy_path, "conf", "testvars.json")) + + if self.config['test_about_blank']: + cmd.append("--testvars=%s" % os.path.join(self.awsy_path, "conf", "base-testvars.json")) + else: + cmd.append("--testvars=%s" % os.path.join(self.awsy_path, "conf", "testvars.json")) + cmd.append("--testvars=%s" % runtime_testvars_path) cmd.append("--log-raw=-") cmd.append("--log-errorsummary=%s" % error_summary_file)