Title: [144267] trunk/Tools
- Revision
- 144267
- Author
- [email protected]
- Date
- 2013-02-27 23:57:29 -0800 (Wed, 27 Feb 2013)
Log Message
PerfTestRunner doesn't need _needs_http and _has_http_lock
https://bugs.webkit.org/show_bug.cgi?id=111037
Reviewed by Adam Barth.
Delete these variables in favor of using a local variable.
Member variables are like global variables. They introduce implicit dependencies
between member functions.
* Scripts/webkitpy/performance_tests/perftestsrunner.py:
(PerfTestsRunner.__init__):
(PerfTestsRunner._start_http_servers):
(PerfTestsRunner):
(PerfTestsRunner._stop_http_servers):
(PerfTestsRunner.run):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (144266 => 144267)
--- trunk/Tools/ChangeLog 2013-02-28 07:55:58 UTC (rev 144266)
+++ trunk/Tools/ChangeLog 2013-02-28 07:57:29 UTC (rev 144267)
@@ -1,3 +1,22 @@
+2013-02-27 Ryosuke Niwa <[email protected]>
+
+ PerfTestRunner doesn't need _needs_http and _has_http_lock
+ https://bugs.webkit.org/show_bug.cgi?id=111037
+
+ Reviewed by Adam Barth.
+
+ Delete these variables in favor of using a local variable.
+
+ Member variables are like global variables. They introduce implicit dependencies
+ between member functions.
+
+ * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+ (PerfTestsRunner.__init__):
+ (PerfTestsRunner._start_http_servers):
+ (PerfTestsRunner):
+ (PerfTestsRunner._stop_http_servers):
+ (PerfTestsRunner.run):
+
2013-02-27 Sheriff Bot <[email protected]>
Unreviewed, rolling out r144224.
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py (144266 => 144267)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2013-02-28 07:55:58 UTC (rev 144266)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2013-02-28 07:57:29 UTC (rev 144267)
@@ -69,8 +69,6 @@
self._results = {}
self._timestamp = time.time()
self._utc_timestamp = datetime.datetime.utcnow()
- self._needs_http = None
- self._has_http_lock = False
@staticmethod
def _parse_args(args=None):
@@ -163,21 +161,18 @@
return tests
- def _start_servers(self):
- if self._needs_http:
- self._port.acquire_http_lock()
- self._port.start_http_server(number_of_servers=2)
- self._has_http_lock = True
+ def _start_http_servers(self):
+ self._port.acquire_http_lock()
+ self._port.start_http_server(number_of_servers=2)
- def _stop_servers(self):
- if self._has_http_lock:
- self._port.stop_http_server()
- self._port.release_http_lock()
+ def _stop_http_servers(self):
+ self._port.stop_http_server()
+ self._port.release_http_lock()
def run(self):
- self._needs_http = self._port.requires_http_server()
+ needs_http = self._port.requires_http_server()
- if not self._port.check_build(needs_http=self._needs_http):
+ if not self._port.check_build(needs_http=needs_http):
_log.error("Build not up to date for %s" % self._port._path_to_driver())
return self.EXIT_CODE_BAD_BUILD
@@ -189,11 +184,13 @@
return self.EXIT_CODE_BAD_PREPARATION
try:
- self._start_servers()
+ if needs_http:
+ self._start_http_servers()
unexpected = self._run_tests_set(sorted(list(tests), key=lambda test: test.test_name()), self._port)
finally:
- self._stop_servers()
+ if needs_http:
+ self._stop_http_servers()
if self._options.generate_results and not self._options.profile:
exit_code = self._generate_and_show_results()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
