Changeset 283574 in webkit

Timestamp:

Oct 5, 2021 3:16:45 PM (3 years ago)

Author:

achristensen@apple.com

Message:

TestWebKitAPI.PrivateClickMeasurement.DaemonBasicFunctionality is timing out
​https://bugs.webkit.org/show_bug.cgi?id=231257

• TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:

Originally reviewed as part of ​https://bugs.webkit.org/show_bug.cgi?id=231248
this should fix the error that happens when a previous test run has registered
the test AdAttributionDaemon but then failed before it was started, which leaves
launchd in a state of having already loaded a plist for the mach service named
"org.webkit.pcmtestdaemon.service" so it refuses to load another. The solution is
just to try unloading any previously loaded plist before loading another to clear
state in launchd.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-10-05  Alex Christensen  <achristensen@webkit.org>
+
+        TestWebKitAPI.PrivateClickMeasurement.DaemonBasicFunctionality is timing out
+        https://bugs.webkit.org/show_bug.cgi?id=231257
+
+        * TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:
+        Originally reviewed as part of https://bugs.webkit.org/show_bug.cgi?id=231248
+        this should fix the error that happens when a previous test run has registered
+        the test AdAttributionDaemon but then failed before it was started, which leaves
+        launchd in a state of having already loaded a plist for the mach service named
+        "org.webkit.pcmtestdaemon.service" so it refuses to load another.  The solution is
+        just to try unloading any previously loaded plist before loading another to clear
+        state in launchd.
+
 2021-10-05  Tim Horton  <timothy_horton@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm

@@ -481 +481 @@
     success = [plist writeToURL:plistLocation error:&error];
     EXPECT_TRUE(success);
+    system([NSString stringWithFormat:@"launchctl unload %@ 2> /dev/null", plistLocation.path].fileSystemRepresentation);
     system([NSString stringWithFormat:@"launchctl load %@", plistLocation.path].fileSystemRepresentation);
 #endif