Unreviewed, rolling out r106543.
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 2 Feb 2012 21:03:42 +0000 (21:03 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 2 Feb 2012 21:03:42 +0000 (21:03 +0000)
http://trac.webkit.org/changeset/106543
https://bugs.webkit.org/show_bug.cgi?id=77671

Made tests less stable (Requested by rniwa on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-02-02

PerformanceTests:

* resources/init.html: Removed.

Tools:

* Scripts/webkitpy/performance_tests/perftestsrunner.py:
(PerfTestsRunner):
(PerfTestsRunner.__init__):
(PerfTestsRunner._run_tests_set):
(PerfTestsRunner._run_single_test):
* Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
(MainTest.TestDriver.run_test):
(run_test):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@106584 268f45cc-cd09-0410-ab3c-d52691b4dbfc

PerformanceTests/ChangeLog
PerformanceTests/resources/init.html [deleted file]
Tools/ChangeLog
Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py
Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py

index ca46d96..7ef7311 100644 (file)
@@ -1,3 +1,13 @@
+2012-02-02  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r106543.
+        http://trac.webkit.org/changeset/106543
+        https://bugs.webkit.org/show_bug.cgi?id=77671
+
+        Made tests less stable (Requested by rniwa on #webkit).
+
+        * resources/init.html: Removed.
+
 2012-02-02  Ryosuke Niwa  <rniwa@webkit.org>
 
         [PerformanceTests] tests have dependencies
diff --git a/PerformanceTests/resources/init.html b/PerformanceTests/resources/init.html
deleted file mode 100644 (file)
index 97173fe..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<p>This file is used by run-perf-tests between each test to marginalize the dependency between tests.
-This file is not intended to be opened on a browser.</p>
-<script>
-
-if (window.layoutTestController) {
-    GCController.collect();
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-    // Give 5 seconds to cleanup the mess the last page left.
-    setTimeout(function () { layoutTestController.notifyDone(); }, 5000);
-    document.querySelector('p').innerHTML = 'PASS';
-}
-
-
-</script>
-</body>
-</html>
index e0d67db..765479e 100644 (file)
@@ -1,3 +1,20 @@
+2012-02-02  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r106543.
+        http://trac.webkit.org/changeset/106543
+        https://bugs.webkit.org/show_bug.cgi?id=77671
+
+        Made tests less stable (Requested by rniwa on #webkit).
+
+        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+        (PerfTestsRunner):
+        (PerfTestsRunner.__init__):
+        (PerfTestsRunner._run_tests_set):
+        (PerfTestsRunner._run_single_test):
+        * Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
+        (MainTest.TestDriver.run_test):
+        (run_test):
+
 2012-02-02  Beth Dakin  <bdakin@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=77664
index 097a537..4d88d56 100644 (file)
@@ -47,7 +47,6 @@ _log = logging.getLogger(__name__)
 
 class PerfTestsRunner(object):
     _perf_tests_base_dir = 'PerformanceTests'
-    _initial_page_relative_path = 'resources/init.html'
     _test_directories_for_chromium_style_tests = ['inspector']
     _default_branch = 'webkit-trunk'
     _EXIT_CODE_BAD_BUILD = -1
@@ -67,7 +66,6 @@ class PerfTestsRunner(object):
         self._printer = printing.Printer(self._port, self._options, regular_output, buildbot_output, configure_logging=False)
         self._webkit_base_dir_len = len(self._port.webkit_base())
         self._base_path = self._port.perf_tests_dir()
-        self._initial_page_path = self._host.filesystem.join(self._base_path, self._initial_page_relative_path)
         self._results = {}
         self._timestamp = time.time()
 
@@ -204,6 +202,7 @@ class PerfTestsRunner(object):
         result_count = len(tests)
         expected = 0
         unexpected = 0
+        driver = None
 
         for test in tests:
             driver = port.create_driver(worker_number=1, no_timeout=True)
@@ -283,9 +282,6 @@ class PerfTestsRunner(object):
 
     def _run_single_test(self, test, driver, is_chromium_style):
         test_failed = False
-        output = driver.run_test(DriverInput(self._initial_page_path, 10000, None, False))
-        if output.text != 'PASS\n':
-            self._printer.write('Initialization page failed to load.')
         output = driver.run_test(DriverInput(test, self._options.time_out_ms, None, False))
 
         if output.text == None:
index 56f052e..58bd377 100755 (executable)
@@ -49,9 +49,7 @@ class MainTest(unittest.TestCase):
             text = ''
             timeout = False
             crash = False
-            if driver_input.test_name.endswith('init.html'):
-                text = 'PASS\n'
-            elif driver_input.test_name.endswith('pass.html'):
+            if driver_input.test_name.endswith('pass.html'):
                 text = 'RESULT group_name: test_name= 42 ms'
             elif driver_input.test_name.endswith('timeout.html'):
                 timeout = True
@@ -125,24 +123,6 @@ max 1120
         driver = MainTest.TestDriver()
         return runner._run_single_test(test_name, driver, is_chromium_style=True)
 
-    def test_initial_page_loaded(self):
-        runner = self.create_runner()
-        driver = MainTest.TestDriver()
-        inputs = []
-
-        def run_test(input):
-            inputs.append(input)
-            if input.test_name.endswith('init.html'):
-                return DriverOutput('PASS\n', 'image output', 'some hash', None)
-            else:
-                return DriverOutput('RESULT group_name: test_name= 42 ms\n', 'image output', 'some hash', None)
-
-        driver.run_test = run_test
-        self.assertTrue(runner._run_single_test('pass.html', driver, is_chromium_style=True))
-        self.assertEqual(len(inputs), 2)
-        self.assertEqual(inputs[0].test_name, runner._base_path + '/resources/init.html')
-        self.assertEqual(inputs[1].test_name, 'pass.html')
-
     def test_run_passing_test(self):
         self.assertTrue(self.run_test('pass.html'))