Changeset 283298 in webkit

Timestamp:

Sep 29, 2021 10:00:57 PM (3 years ago)

Author:

achristensen@apple.com

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):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2021-09-29  Alex Christensen  <achristensen@webkit.org>
+
+        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  <cdumez@apple.com>
 

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

@@ -453 +453 @@
     EXPECT_NULL(error);
 
+    system("killall AdAttributionDaemon -9 2> null");
+
     auto plist = testDaemonPList(tempDir);
 #if HAVE(OS_LAUNCHD_JOB)
@@ -477 +479 @@
 
     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]);