Changeset 51096 in webkit

Timestamp:

Nov 17, 2009 4:31:21 PM (14 years ago)

Author:

mrowe@apple.com

Message:

<​http://webkit.org/b/31602> Failing to start the WebSocket server shouldn’t terminate entire test run

Reviewed by Alexey Proskuryakov.

WebKitTools:

If the WebSocket server fails to start have DRT load an error page in place of tests that require the
server to be up rather than having run-webkit-tests abort immediately.

• Scripts/run-webkit-tests:

LayoutTests:

• websocket/resources/server-failed-to-start.html: Error page that will be loaded in place of websocket

tests when the server fails to start.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/websocket/resources (added)
• LayoutTests/websocket/resources/server-failed-to-start.html (added)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/Scripts/run-webkit-tests (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-11-17  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        <http://webkit.org/b/31602> Failing to start the WebSocket server shouldn’t terminate entire test run
+
+        * websocket/resources/server-failed-to-start.html: Error page that will be loaded in place of websocket
+        tests when the server fails to start.
+
 2009-11-17  Brian Weinstein  <bweinstein@apple.com>
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-17  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        <http://webkit.org/b/31602> Failing to start the WebSocket server shouldn’t terminate entire test run
+
+        If the WebSocket server fails to start have DRT load an error page in place of tests that require the
+        server to be up rather than having run-webkit-tests abort immediately.
+
+        * Scripts/run-webkit-tests:
+
 2009-11-17  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/run-webkit-tests

@@ -493 +493 @@
 my $isWebSocketServerOpen = 0;
 my $webSocketServerPID = 0;
+my $failedToStartWebSocketServer = 0;
 # wss is disabled until all platforms support pyOpenSSL.
 # my $webSocketSecureServerPID = 0;
@@ -616 +617 @@
             print OUT "$testPath\n";
         } else {
-            openWebSocketServerIfNeeded();
-            my $path = canonpath($test);
-            if ($test =~ /^websocket\/tests\/ssl\//) {
-                # wss is disabled until all platforms support pyOpenSSL.
-                print STDERR "Error: wss is disabled until all platforms support pyOpenSSL.";
-                # print OUT "https://127.0.0.1:$webSocketSecurePort/$path\n";
+            if (openWebSocketServerIfNeeded()) {
+                my $path = canonpath($test);
+                if ($test =~ /^websocket\/tests\/ssl\//) {
+                    # wss is disabled until all platforms support pyOpenSSL.
+                    print STDERR "Error: wss is disabled until all platforms support pyOpenSSL.";
+                    # print OUT "https://127.0.0.1:$webSocketSecurePort/$path\n";
+                } else {
+                    print OUT "http://127.0.0.1:$webSocketPort/$path\n";
+                }
             } else {
-                print OUT "http://127.0.0.1:$webSocketPort/$path\n";
+                # We failed to launch the WebSocket server.  Display a useful error message rather than attempting
+                # to run tests that expect the server to be available.
+                my $errorMessagePath = "$testDirectory/websocket/resources/server-failed-to-start.html";
+                $errorMessagePath = isCygwin() ? toWindowsPath($errorMessagePath) : canonpath($errorMessagePath);
+                print OUT "$errorMessagePath\n";
             }
         }
@@ -1409 +1417 @@
 sub openWebSocketServerIfNeeded()
 {
-    return if $isWebSocketServerOpen;
+    return 1 if $isWebSocketServerOpen;
+    return 0 if $failedToStartWebSocketServer;
 
     my $webSocketServerPath = "/usr/bin/python";
@@ -1444 +1453 @@
             --$retryCount;
         }
-        die "Timed out waiting for WebSocketServer to start" unless $retryCount;
+        unless ($retryCount) {
+            print STDERR "Timed out waiting for WebSocketServer to start.\n";
+            $failedToStartWebSocketServer = 1;
+            return 0;
+        }
     }
 
     $isWebSocketServerOpen = 1;
+    return 1;
 }