Changeset 139095 in webkit

Timestamp:

Jan 8, 2013 12:23:47 PM (11 years ago)

Author:

zandobersek@gmail.com

Message:

[EFL][GTK] Make the PulseAudioSanitizer an object on the EflPort, GtkPort
​https://bugs.webkit.org/show_bug.cgi?id=106354

Reviewed by Eric Seidel.

Put the PulseAudioSanitizer object on the EflPort and GtkPort interfaces
instead of those two inheriting from it. Also add a mock object of the
sanitizer that's used in unit tests.

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

(EflPort):
(EflPort.init):
(EflPort.setup_test_run):
(EflPort.clean_up_test_run):

• Scripts/webkitpy/layout_tests/port/efl_unittest.py: Also correct the

importing order.
(EflPortTest.make_port): Put a mock PulseAudioSanitizer on the instance.

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

(GtkPort):
(GtkPort.init):
(GtkPort.setup_test_run):
(GtkPort.clean_up_test_run):

• Scripts/webkitpy/layout_tests/port/gtk_unittest.py: Also correct the

importing order.
(GtkPortTest.make_port): Put a mock PulseAudioSanitizer on the instance.

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

(PulseAudioSanitizer.unload_pulseaudio_module): Stylize the method as public.
(PulseAudioSanitizer.restore_pulseaudio_module): Ditto.

• Scripts/webkitpy/layout_tests/port/pulseaudio_sanitizer_mock.py: Added.

(PulseAudioSanitizerMock): A simple mock interface for PulseAudioSanitizer.
(PulseAudioSanitizerMock.unload_pulseaudio_module):
(PulseAudioSanitizerMock.restore_pulseaudio_module):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/efl.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/port/efl_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/gtk.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/gtk_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/pulseaudio_sanitizer.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/pulseaudio_sanitizer_mock.py (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-08  Zan Dobersek  <zandobersek@gmail.com>
+
+        [EFL][GTK] Make the PulseAudioSanitizer an object on the EflPort, GtkPort
+        https://bugs.webkit.org/show_bug.cgi?id=106354
+
+        Reviewed by Eric Seidel.
+
+        Put the PulseAudioSanitizer object on the EflPort and GtkPort interfaces
+        instead of those two inheriting from it. Also add a mock object of the
+        sanitizer that's used in unit tests.
+
+        * Scripts/webkitpy/layout_tests/port/efl.py:
+        (EflPort):
+        (EflPort.__init__):
+        (EflPort.setup_test_run):
+        (EflPort.clean_up_test_run):
+        * Scripts/webkitpy/layout_tests/port/efl_unittest.py: Also correct the
+        importing order.
+        (EflPortTest.make_port): Put a mock PulseAudioSanitizer on the instance.
+        * Scripts/webkitpy/layout_tests/port/gtk.py:
+        (GtkPort):
+        (GtkPort.__init__):
+        (GtkPort.setup_test_run):
+        (GtkPort.clean_up_test_run):
+        * Scripts/webkitpy/layout_tests/port/gtk_unittest.py: Also correct the
+        importing order.
+        (GtkPortTest.make_port): Put a mock PulseAudioSanitizer on the instance.
+        * Scripts/webkitpy/layout_tests/port/pulseaudio_sanitizer.py:
+        (PulseAudioSanitizer.unload_pulseaudio_module): Stylize the method as public.
+        (PulseAudioSanitizer.restore_pulseaudio_module): Ditto.
+        * Scripts/webkitpy/layout_tests/port/pulseaudio_sanitizer_mock.py: Added.
+        (PulseAudioSanitizerMock): A simple mock interface for PulseAudioSanitizer.
+        (PulseAudioSanitizerMock.unload_pulseaudio_module):
+        (PulseAudioSanitizerMock.restore_pulseaudio_module):
+
 2013-01-08  Jochen Eisinger  <jochen@chromium.org>
 

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

@@ -35 +35 @@
 from webkitpy.layout_tests.port.xvfbdriver import XvfbDriver
 
-class EflPort(Port, PulseAudioSanitizer):
+
+class EflPort(Port):
     port_name = 'efl'
 
@@ -46 +47 @@
         self.webprocess_cmd_prefix = self.get_option('webprocess_cmd_prefix')
 
+        self._pulseaudio_sanitizer = PulseAudioSanitizer()
+
     def _port_flag_for_scripts(self):
         return "--efl"
 
     def setup_test_run(self):
-        self._unload_pulseaudio_module()
+        self._pulseaudio_sanitizer.unload_pulseaudio_module()
 
     def setup_environ_for_server(self, server_name=None):
@@ -74 +77 @@
     def clean_up_test_run(self):
         super(EflPort, self).clean_up_test_run()
-        self._restore_pulseaudio_module()
+        self._pulseaudio_sanitizer.restore_pulseaudio_module()
 
     def _generate_all_test_configurations(self):

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

@@ -27 +27 @@
 import unittest
 
+from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.layout_tests.port.efl import EflPort
+from webkitpy.layout_tests.port.pulseaudio_sanitizer_mock import PulseAudioSanitizerMock
 from webkitpy.layout_tests.port import port_testcase
-from webkitpy.common.system.executive_mock import MockExecutive
 
 
@@ -40 +41 @@
     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
+        port._pulseaudio_sanitizer = PulseAudioSanitizerMock()
         return port
 

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

@@ -36 +36 @@
 
 
-class GtkPort(Port, PulseAudioSanitizer):
+class GtkPort(Port):
     port_name = "gtk"
+
+    def __init__(self, *args, **kwargs):
+        super(GtkPort, self).__init__(*args, **kwargs)
+        self._pulseaudio_sanitizer = PulseAudioSanitizer()
 
     def warn_if_bug_missing_in_test_expectations(self):
@@ -54 +58 @@
 
     def setup_test_run(self):
-        self._unload_pulseaudio_module()
+        self._pulseaudio_sanitizer.unload_pulseaudio_module()
 
     def clean_up_test_run(self):
         super(GtkPort, self).clean_up_test_run()
-        self._restore_pulseaudio_module()
+        self._pulseaudio_sanitizer.restore_pulseaudio_module()
 
     def setup_environ_for_server(self, server_name=None):

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

@@ -31 +31 @@
 import os
 
+from webkitpy.common.system.executive_mock import MockExecutive
+from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.layout_tests.port.gtk import GtkPort
+from webkitpy.layout_tests.port.pulseaudio_sanitizer_mock import PulseAudioSanitizerMock
 from webkitpy.layout_tests.port import port_testcase
-from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.thirdparty.mock import Mock
-from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.tool.mocktool import MockOptions
 
@@ -47 +48 @@
     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
+        port._pulseaudio_sanitizer = PulseAudioSanitizerMock()
         return port
 

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

@@ -38 +38 @@
 # Shared by GTK and EFL for pulseaudio sanitizing before running tests.
 class PulseAudioSanitizer:
-    def _unload_pulseaudio_module(self):
+    def unload_pulseaudio_module(self):
         # Unload pulseaudio's module-stream-restore, since it remembers
         # volume settings from different runs, and could affect
@@ -72 +72 @@
                 return
 
-    def _restore_pulseaudio_module(self):
+    def restore_pulseaudio_module(self):
         # If pulseaudio's module-stream-restore was previously unloaded,
         # restore it back. We shouldn't need extra checks here, since an