Merge branch 'mkirk/fix-test-run'

Podfile

@@ -11,7 +11,7 @@ def shared_pods
   pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release'
   pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git'
   # pod 'AxolotlKit', path: '../SignalProtocolKit'
-  pod 'SignalServiceKit', path: '.', testspecs: ["Tests"]
+  pod 'SignalServiceKit', path: '.'
   pod 'HKDFKit', git: 'https://github.com/signalapp/HKDFKit.git'
   # pod 'HKDFKit', path: '../HKDFKit'
   pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit'

Podfile.lock

@@ -62,20 +62,6 @@ PODS:
     - SocketRocket
     - SwiftProtobuf
     - YapDatabase/SQLCipher
-  - SignalServiceKit/Tests (0.9.0):
-    - AFNetworking
-    - AxolotlKit
-    - CocoaLumberjack
-    - Curve25519Kit
-    - GRKOpenSSLFramework
-    - libPhoneNumber-iOS
-    - Mantle
-    - PromiseKit (~> 4.0)
-    - Reachability
-    - SAMKeychain
-    - SocketRocket
-    - SwiftProtobuf
-    - YapDatabase/SQLCipher
   - SocketRocket (0.5.1)
   - SQLCipher (3.4.2):
     - SQLCipher/standard (= 3.4.2)
@@ -160,7 +146,6 @@ DEPENDENCIES:
   - PureLayout
   - Reachability
   - SignalServiceKit (from `.`)
-  - SignalServiceKit/Tests (from `.`)
   - SocketRocket (from `https://github.com/signalapp/SocketRocket.git`, branch `mkirk/handle-sec-err`)
   - SQLCipher (from `https://github.com/sqlcipher/sqlcipher.git`, commit `d5c2bec`)
   - SSZipArchive
@@ -246,6 +231,6 @@ SPEC CHECKSUMS:
   YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
   YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
 
-PODFILE CHECKSUM: 40c4fc7dfb6066c4fdb80bc08600096e172dd4d7
+PODFILE CHECKSUM: cb4f38eaa6b1bdf86cfe440ef964c628e6d8321d
 
 COCOAPODS: 1.5.3

Pods

@@ -1 +1 @@
-Subproject commit c20b80e3952ccdb215831c4063c79d479d1cd702
+Subproject commit 675e4be7f1a7c35d447965143ca0cadef99a179e

Signal/test/util/OWSOrphanDataCleanerTest.m

@@ -5,12 +5,13 @@
 #import "OWSOrphanDataCleaner.h"
 #import "OWSDevice.h"
 #import "OWSPrimaryStorage.h"
+#import "SignalBaseTest.h"
 #import "TSAttachmentStream.h"
 #import "TSContactThread.h"
 #import "TSIncomingMessage.h"
 #import <XCTest/XCTest.h>
 
-@interface OWSOrphanDataCleanerTest : XCTestCase
+@interface OWSOrphanDataCleanerTest : SignalBaseTest
 
 @end