[GTK] run-gtk-tests randomly fails while running the xprop comand

https://bugs.webkit.org/show_bug.cgi?id=76817

Reviewed by Gustavo Noronha Silva.

No need to use xprop to remove the AT_SPI_BUS property since
run-gtk-tests will always run new instances of Xvfb.

* Scripts/run-gtk-tests:
(TestRunner): Unskip TestWebKitAccessibility.
(TestRunner.run): Uncomment lines for launching the accessibility
bus and registry daemon, and remove lines for running xprop.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 851b991..1951c2d 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2012-01-23  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        [GTK] run-gtk-tests randomly fails while running the xprop comand
+        https://bugs.webkit.org/show_bug.cgi?id=76817
+
+        Reviewed by Gustavo Noronha Silva.
+
+        No need to use xprop to remove the AT_SPI_BUS property since
+        run-gtk-tests will always run new instances of Xvfb.
+
+        * Scripts/run-gtk-tests:
+        (TestRunner): Unskip TestWebKitAccessibility.
+        (TestRunner.run): Uncomment lines for launching the accessibility
+        bus and registry daemon, and remove lines for running xprop.
+
 2012-01-23  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
         [Qt] Don't warn about override and final being C++11 extensions

diff --git a/Tools/Scripts/run-gtk-tests b/Tools/Scripts/run-gtk-tests
index 93dc535..3f062c9 100755 (executable)
--- a/Tools/Scripts/run-gtk-tests
+++ b/Tools/Scripts/run-gtk-tests
@@ -25,7 +25,7 @@ class TestRunner:
 
     TEST_DIRS = [ "unittests", "WebKit2APITests" ]
     # FIXME: https://bugs.webkit.org/show_bug.cgi?id=74717
-    SKIPPED = [ "unittests/testdownload", "unittests/testwebview", "unittests/testwebresource", "WebKit2APITests/TestWebKitAccessibility" ]
+    SKIPPED = [ "unittests/testdownload", "unittests/testwebview", "unittests/testwebresource" ]
 
     def __init__(self):
         self._executive = Executive()
@@ -92,40 +92,27 @@ class TestRunner:
 
         jhbuild_path = os.path.join(self._gtk_tools_directory, "run-with-jhbuild")
 
-        # Make sure there's no AT_SPI_BUS X's property previously set,
-        # otherwise the accessibility bus couldn't be properly launched.
-
-        # FIXME: Commenting this line while figuring out why this
-        # fails randomly in the GTK bots, making the API tests fail.
-        # https://bugs.webkit.org/show_bug.cgi?id=76817
-        # self._executive.run_command(['xprop', '-root', '-remove', 'AT_SPI_BUS'], env=test_env)
-
         # Make sure the accessibility bus is launched.
         a11y_bus_launched = False
-        # FIXME: Commenting the next lines while figuring out why this
-        # fails randomly in the GTK bots, making the API tests fail.
-        # https://bugs.webkit.org/show_bug.cgi?id=76817
-        # a11y_bus_launcher_path = self._lookup_atspi2_binary(jhbuild_path, 'at-spi-bus-launcher')
-        # if a11y_bus_launcher_path:
-        #     try:
-        #         a11y_bus_launcher = Executive().popen([a11y_bus_launcher_path], env=test_env)
-        #         a11y_bus_launched = True
-        #     except:
-        #         sys.stderr.write("Failed to launch the accessibility bus\n")
-        #         sys.stderr.flush()
-
+        a11y_bus_launcher_path = self._lookup_atspi2_binary(jhbuild_path, 'at-spi-bus-launcher')
+        if a11y_bus_launcher_path:
+            try:
+                a11y_bus_launcher = Executive().popen([a11y_bus_launcher_path], env=test_env)
+                a11y_bus_launched = True
+            except:
+                sys.stderr.write("Failed to launch the accessibility bus\n")
+                sys.stderr.flush()
+
+        # Make sure the accessibility registry daemon is running.
         a11y_registryd_running = False
-        # FIXME: Commenting the next lines while figuring out why this
-        # fails randomly in the GTK bots, making the API tests fail.
-        # https://bugs.webkit.org/show_bug.cgi?id=76817
-        # a11y_registryd_path = self._lookup_atspi2_binary(jhbuild_path, 'at-spi2-registryd')
-        # if a11y_registryd_path:
-        #     try:
-        #         a11y_registryd = Executive().popen([a11y_registryd_path], env=test_env)
-        #         a11y_registryd_running = True
-        #     except:
-        #         sys.stderr.write("Failed to run the accessibility registry\n")
-        #         sys.stderr.flush()
+        a11y_registryd_path = self._lookup_atspi2_binary(jhbuild_path, 'at-spi2-registryd')
+        if a11y_registryd_path:
+            try:
+                a11y_registryd = Executive().popen([a11y_registryd_path], env=test_env)
+                a11y_registryd_running = True
+            except:
+                sys.stderr.write("Failed to run the accessibility registry\n")
+                sys.stderr.flush()
 
         for test in self._tests:
             out = self._executive.run_command([jhbuild_path ,'gtester', test], env=test_env,