From a7bd3721474adf7efba32a46714dd3ab82e4f71c Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 07:03:03 -0600 Subject: [PATCH] Fix tests by removing side effect in getter While setting up the test CurrentAppContect, we use OWSTemporaryDirectory which in turn recursively references CurrentAppContext, which crashes. Clearing temp directories on every activation is sufficient. --- SignalServiceKit/src/Util/OWSFileSystem.m | 8 -------- 1 file changed, 8 deletions(-) diff --git a/SignalServiceKit/src/Util/OWSFileSystem.m b/SignalServiceKit/src/Util/OWSFileSystem.m index 36d4a8f07..4f2d5c3ac 100644 --- a/SignalServiceKit/src/Util/OWSFileSystem.m +++ b/SignalServiceKit/src/Util/OWSFileSystem.m @@ -348,14 +348,6 @@ NSString *OWSTemporaryDirectory(void) dirPath = [NSTemporaryDirectory() stringByAppendingPathComponent:dirName]; BOOL success = [OWSFileSystem ensureDirectoryExists:dirPath fileProtectionType:NSFileProtectionComplete]; OWSCAssert(success); - - // On launch, clear old temp directories. - // - // NOTE: ClearOldTemporaryDirectoriesSync() will call this function - // OWSTemporaryDirectory(), but there's no risk of deadlock; - // ClearOldTemporaryDirectories() calls ClearOldTemporaryDirectoriesSync() - // after a long delay. - ClearOldTemporaryDirectories(); }); return dirPath; }