Ori.livneh has submitted this change and it was merged.
Change subject: vbench: add 'vb' launcher
......................................................................
vbench: add 'vb' launcher
Runs Chromium as part of the test suite, rather than using a global Chromium
instance.
Change-Id: I28ae265729171734b0efbc4eacaec6c8775a2551
---
M files/ve/vbench
M manifests/role/ve.pp
2 files changed, 34 insertions(+), 30 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/files/ve/vbench b/files/ve/vbench
index 03c32bd..7b759fd 100755
--- a/files/ve/vbench
+++ b/files/ve/vbench
@@ -85,10 +85,6 @@
'''
-class ChromeException(Exception):
- pass
-
-
class HighlightingFormatter(logging.Formatter):
RE = re.compile(r'(?P<markup>(\*)|(_))(?P<word>\S+)(?(2)\*)(?(3)_)')
@@ -100,7 +96,8 @@
self.subs = {'*': self.WHITE, '_': self.YELLOW, 'end': self.RESET}
else:
self.subs = {}
- fmt = self.highlight(fmt)
+ if fmt:
+ fmt = self.highlight(fmt)
super(HighlightingFormatter, self).__init__(fmt, '%I:%M:%S')
def repl(self, match):
@@ -110,10 +107,10 @@
def highlight(self, s):
return self.RE.sub(self.repl, s)
- return super(HighlightingFormatter, self).format(record)
def format(self, record):
- record.msg = self.highlight(record.msg)
+ if isinstance(record.msg, basestring):
+ record.msg = self.highlight(record.msg)
return super(HighlightingFormatter, self).format(record)
diff --git a/manifests/role/ve.pp b/manifests/role/ve.pp
index 00716a5..d6e6d35 100644
--- a/manifests/role/ve.pp
+++ b/manifests/role/ve.pp
@@ -19,29 +19,29 @@
# disable various features that add noise to profiling or that
# rely on user input.
- class { 'chromium':
- extra_args => [
- '--disable-background-networking',
- '--disable-client-side-phishing-detection',
- '--disable-component-update',
- '--disable-default-apps',
- '--disable-extensions',
- '--disable-hang-monitor',
- '--disable-infobars',
- '--disable-plugins-discovery',
- '--disable-prompt-on-repost',
- '--disable-suggestions-service',
- '--disable-sync',
- '--disable-translate',
- '--disable-v8-idle-tasks',
- '--disable-web-resources',
- '--no-default-browser-check',
- '--no-first-run',
- '--host-rules="MAP * localhost, EXCLUDE upload.wikimedia.org"',
- '--safebrowsing-disable-auto-update',
- '--safebrowsing-disable-download-protection',
- ],
- }
+ # class { 'chromium':
+ # extra_args => [
+ # '--disable-background-networking',
+ # '--disable-client-side-phishing-detection',
+ # '--disable-component-update',
+ # '--disable-default-apps',
+ # '--disable-extensions',
+ # '--disable-hang-monitor',
+ # '--disable-infobars',
+ # '--disable-plugins-discovery',
+ # '--disable-prompt-on-repost',
+ # '--disable-suggestions-service',
+ # '--disable-sync',
+ # '--disable-translate',
+ # '--disable-v8-idle-tasks',
+ # '--disable-web-resources',
+ # '--no-default-browser-check',
+ # '--no-first-run',
+ # '--host-rules="MAP * localhost, EXCLUDE upload.wikimedia.org"',
+ # '--safebrowsing-disable-auto-update',
+ # '--safebrowsing-disable-download-protection',
+ # ],
+ # }
# vbench is a CLI tool for benchmarking VisualEditor.
@@ -57,4 +57,11 @@
group => 'root',
mode => '0555',
}
+
+ file { '/usr/local/bin/vb':
+ source => 'puppet:///files/ve/vb',
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/189630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28ae265729171734b0efbc4eacaec6c8775a2551
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
