Title: [283574] trunk/Tools
- Revision
- 283574
- Author
- [email protected]
- Date
- 2021-10-05 15:16:45 -0700 (Tue, 05 Oct 2021)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (283573 => 283574)
--- trunk/Tools/ChangeLog 2021-10-05 22:15:21 UTC (rev 283573)
+++ trunk/Tools/ChangeLog 2021-10-05 22:16:45 UTC (rev 283574)
@@ -1,3 +1,17 @@
+2021-10-05 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
<model> should be draggable, similar to <img>
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm (283573 => 283574)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm 2021-10-05 22:15:21 UTC (rev 283573)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm 2021-10-05 22:16:45 UTC (rev 283574)
@@ -480,6 +480,7 @@
EXPECT_NULL(error);
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
EXPECT_NULL(error);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
