Suppress messages from the browser
This commit is contained in:
parent
fa89ebe537
commit
ade4438537
@ -12,6 +12,7 @@ DOC_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__),".."))
|
|||||||
ANAL = True
|
ANAL = True
|
||||||
DEFAULT_MANIFEST_FILE = 'test_manifest.json'
|
DEFAULT_MANIFEST_FILE = 'test_manifest.json'
|
||||||
EQLOG_FILE = 'eq.log'
|
EQLOG_FILE = 'eq.log'
|
||||||
|
BROWSERLOG_FILE = 'browser.log'
|
||||||
REFDIR = 'ref'
|
REFDIR = 'ref'
|
||||||
TMPDIR = 'tmp'
|
TMPDIR = 'tmp'
|
||||||
VERBOSE = False
|
VERBOSE = False
|
||||||
@ -229,6 +230,7 @@ class BaseBrowserCommand(object):
|
|||||||
def setup(self):
|
def setup(self):
|
||||||
self.tempDir = tempfile.mkdtemp()
|
self.tempDir = tempfile.mkdtemp()
|
||||||
self.profileDir = os.path.join(self.tempDir, "profile")
|
self.profileDir = os.path.join(self.tempDir, "profile")
|
||||||
|
self.browserLog = open(BROWSERLOG_FILE, "w")
|
||||||
|
|
||||||
def teardown(self):
|
def teardown(self):
|
||||||
# If the browser is still running, wait up to ten seconds for it to quit
|
# 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):
|
if self.tempDir is not None and os.path.exists(self.tempDir):
|
||||||
shutil.rmtree(self.tempDir)
|
shutil.rmtree(self.tempDir)
|
||||||
|
|
||||||
|
self.browserLog.close()
|
||||||
|
|
||||||
def start(self, url):
|
def start(self, url):
|
||||||
raise Exception("Can't start BaseBrowserCommand")
|
raise Exception("Can't start BaseBrowserCommand")
|
||||||
|
|
||||||
@ -262,7 +266,7 @@ class FirefoxBrowserCommand(BaseBrowserCommand):
|
|||||||
if platform.system() == "Darwin":
|
if platform.system() == "Darwin":
|
||||||
cmds.append("-foreground")
|
cmds.append("-foreground")
|
||||||
cmds.extend(["-no-remote", "-profile", self.profileDir, url])
|
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):
|
class ChromeBrowserCommand(BaseBrowserCommand):
|
||||||
def _fixupMacPath(self):
|
def _fixupMacPath(self):
|
||||||
@ -272,7 +276,7 @@ class ChromeBrowserCommand(BaseBrowserCommand):
|
|||||||
cmds = [self.path]
|
cmds = [self.path]
|
||||||
cmds.extend(["--user-data-dir=%s" % self.profileDir,
|
cmds.extend(["--user-data-dir=%s" % self.profileDir,
|
||||||
"--no-first-run", "--disable-sync", url])
|
"--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):
|
def makeBrowserCommand(browser):
|
||||||
path = browser["path"].lower()
|
path = browser["path"].lower()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user