Changeset 139084 in webkit

Timestamp:

Jan 8, 2013 11:19:37 AM (11 years ago)

Author:

zandobersek@gmail.com

Message:

test-webkitpy shows failure output on my linux box
​https://bugs.webkit.org/show_bug.cgi?id=101261

Reviewed by Eric Seidel.

Mock out the PulseAudioSanitizer methods when creating testing instances
of EflPort and GtkPort interfaces in unit tests. This stops throwing up
PulseAudio output when the sanitizer was trying to unload modules which
were already unloaded by another unit test that was being run in parallel.

• Scripts/webkitpy/layout_tests/port/efl_unittest.py:

(EflPortTest):
(EflPortTest.make_port):

• Scripts/webkitpy/layout_tests/port/gtk_unittest.py:

(GtkPortTest):
(GtkPortTest.make_port):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/efl_unittest.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/gtk_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-08  Zan Dobersek  <zandobersek@gmail.com>
+
+        test-webkitpy shows failure output on my linux box
+        https://bugs.webkit.org/show_bug.cgi?id=101261
+
+        Reviewed by Eric Seidel.
+
+        Mock out the PulseAudioSanitizer methods when creating testing instances
+        of EflPort and GtkPort interfaces in unit tests. This stops throwing up
+        PulseAudio output when the sanitizer was trying to unload modules which
+        were already unloaded by another unit test that was being run in parallel.
+
+        * Scripts/webkitpy/layout_tests/port/efl_unittest.py:
+        (EflPortTest):
+        (EflPortTest.make_port):
+        * Scripts/webkitpy/layout_tests/port/gtk_unittest.py:
+        (GtkPortTest):
+        (GtkPortTest.make_port):
+
 2013-01-08  Julie Parent  <jparent@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/efl_unittest.py

@@ -37 +37 @@
     port_maker = EflPort
 
+    # Additionally mocks out the PulseAudioSanitizer methods.
+    def make_port(self, host=None, port_name=None, options=None, os_name=None, os_version=None, **kwargs):
+        port = super(EflPortTest, self).make_port(host, port_name, options, os_name, os_version, **kwargs)
+        port._unload_pulseaudio_module = lambda: None
+        port._restore_pulseaudio_module = lambda: None
+        return port
+
     def test_show_results_html_file(self):
         port = self.make_port()

trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk_unittest.py

@@ -43 +43 @@
     port_name = 'gtk'
     port_maker = GtkPort
+
+    # Additionally mocks out the PulseAudioSanitizer methods.
+    def make_port(self, host=None, port_name=None, options=None, os_name=None, os_version=None, **kwargs):
+        port = super(GtkPortTest, self).make_port(host, port_name, options, os_name, os_version, **kwargs)
+        port._unload_pulseaudio_module = lambda: None
+        port._restore_pulseaudio_module = lambda: None
+        return port
 
     def test_expectations_files(self):