From ade44385379127df5a4b75fa5c38a202fd819669 Mon Sep 17 00:00:00 2001 From: notmasteryet Date: Thu, 8 Dec 2011 20:51:12 -0600 Subject: [PATCH] Suppress messages from the browser --- test/test.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/test.py b/test/test.py index 256200587..888bd9ce8 100644 --- a/test/test.py +++ b/test/test.py @@ -12,6 +12,7 @@ DOC_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__),"..")) ANAL = True DEFAULT_MANIFEST_FILE = 'test_manifest.json' EQLOG_FILE = 'eq.log' +BROWSERLOG_FILE = 'browser.log' REFDIR = 'ref' TMPDIR = 'tmp' VERBOSE = False @@ -229,6 +230,7 @@ class BaseBrowserCommand(object): def setup(self): self.tempDir = tempfile.mkdtemp() self.profileDir = os.path.join(self.tempDir, "profile") + self.browserLog = open(BROWSERLOG_FILE, "w") def teardown(self): # If the browser is still running, wait up to ten seconds for it to quit @@ -245,6 +247,8 @@ class BaseBrowserCommand(object): if self.tempDir is not None and os.path.exists(self.tempDir): shutil.rmtree(self.tempDir) + self.browserLog.close() + def start(self, url): raise Exception("Can't start BaseBrowserCommand") @@ -262,7 +266,7 @@ class FirefoxBrowserCommand(BaseBrowserCommand): if platform.system() == "Darwin": cmds.append("-foreground") cmds.extend(["-no-remote", "-profile", self.profileDir, url]) - self.process = subprocess.Popen(cmds) + self.process = subprocess.Popen(cmds, stdout = self.browserLog, stderr = self.browserLog) class ChromeBrowserCommand(BaseBrowserCommand): def _fixupMacPath(self): @@ -272,7 +276,7 @@ class ChromeBrowserCommand(BaseBrowserCommand): cmds = [self.path] cmds.extend(["--user-data-dir=%s" % self.profileDir, "--no-first-run", "--disable-sync", url]) - self.process = subprocess.Popen(cmds) + self.process = subprocess.Popen(cmds, stdout = self.browserLog, stderr = self.browserLog) def makeBrowserCommand(browser): path = browser["path"].lower()