Bug 1457243 - Part 7: Followup - Setup base case testvars. r=me

We need testvars for the base case as well.

--HG--
extra : rebase_source : 0fbe7b3e206262d47f78e1289dceb02878ad987b
extra : histedit_source : fd1eabcc887e91dff8f4ec2e00b03fcd8bb68c9b
This commit is contained in:
Eric Rahm 2018-05-11 14:33:12 -07:00
parent 80aa8d9625
commit 1ff3563202
3 changed files with 12 additions and 3 deletions

View File

@ -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)

View File

@ -0,0 +1,6 @@
{
"entities": 4,
"iterations": 1,
"perTabPause": 10,
"settleWaitTime": 60
}

View File

@ -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)