Title: [283298] trunk/Tools
- Revision
- 283298
- Author
- [email protected]
- Date
- 2021-09-29 22:00:57 -0700 (Wed, 29 Sep 2021)
Log Message
Terminate PCM daemon before and after unit test that uses it
https://bugs.webkit.org/show_bug.cgi?id=230191
In r282368 I added a unit test that creates a daemon, uses it, then terminates it.
On some bots it has been timing out. Once it starts timing out, it probably won't stop because
it won't get to the part of the test that terminates the problematic daemon.
* TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:
(TestWebKitAPI::TEST):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (283297 => 283298)
--- trunk/Tools/ChangeLog 2021-09-30 04:18:17 UTC (rev 283297)
+++ trunk/Tools/ChangeLog 2021-09-30 05:00:57 UTC (rev 283298)
@@ -1,3 +1,15 @@
+2021-09-29 Alex Christensen <[email protected]>
+
+ Terminate PCM daemon before and after unit test that uses it
+ https://bugs.webkit.org/show_bug.cgi?id=230191
+
+ In r282368 I added a unit test that creates a daemon, uses it, then terminates it.
+ On some bots it has been timing out. Once it starts timing out, it probably won't stop because
+ it won't get to the part of the test that terminates the problematic daemon.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:
+ (TestWebKitAPI::TEST):
+
2021-09-29 Chris Dumez <[email protected]>
Add support for running service workers on the main thread
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm (283297 => 283298)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm 2021-09-30 04:18:17 UTC (rev 283297)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm 2021-09-30 05:00:57 UTC (rev 283298)
@@ -452,6 +452,8 @@
[fileManager removeItemAtURL:tempDir error:&error];
EXPECT_NULL(error);
+ system("killall AdAttributionDaemon -9 2> null");
+
auto plist = testDaemonPList(tempDir);
#if HAVE(OS_LAUNCHD_JOB)
auto launchDJob = adoptNS([[OSLaunchdJob alloc] initWithPlist:plist.get()]);
@@ -476,11 +478,6 @@
});
system("killall AdAttributionDaemon -9");
-#if HAVE(OS_LAUNCHD_JOB)
- // LaunchOnlyOnce takes care of cleanup with launchd.
-#else
- system([NSString stringWithFormat:@"launchctl unload %@", plistLocation.path].UTF8String);
-#endif
EXPECT_TRUE([fileManager fileExistsAtPath:tempDir.path]);
[fileManager removeItemAtURL:tempDir error:&error];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
