From 02247695b17a54e7328a992339a25fa54cf779cd Mon Sep 17 00:00:00 2001
From: Blake Watters <blakewatters@gmail.com>
Date: Thu, 7 Mar 2013 15:33:11 -0500
Subject: [PATCH] Fix intermittent crashes during test execution

---
 .../RKManagedObjectMappingOperationDataSourceTest.m        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Tests/Logic/CoreData/RKManagedObjectMappingOperationDataSourceTest.m b/Tests/Logic/CoreData/RKManagedObjectMappingOperationDataSourceTest.m
index 2550ad5d..c1a84d1c 100644
--- a/Tests/Logic/CoreData/RKManagedObjectMappingOperationDataSourceTest.m
+++ b/Tests/Logic/CoreData/RKManagedObjectMappingOperationDataSourceTest.m
@@ -23,6 +23,9 @@
 
 @end
 
+/**
+ NOTE: You need to take care that you allow the operationQueue to finish before the next test begins execution, else the Core Data tear down can result in intermittent test crashes.
+ */
 @implementation RKManagedObjectMappingOperationDataSourceTest
 
 - (void)setUp
@@ -573,6 +576,8 @@
     assertThatBool(success, is(equalToBool(YES)));
     assertThat(human.favoriteCat, isNot(nilValue()));
     assertThat(human.favoriteCat.name, is(equalTo(@"Asia")));
+    
+    [mappingOperationDataSource.operationQueue waitUntilAllOperationsAreFinished];
 }
 
 - (void)testShouldConnectRelationshipsByPrimaryKeyReverse
@@ -906,6 +911,8 @@
     assertThat([[parent.children anyObject] parents], isNot(nilValue()));
     assertThatBool([[[parent.children anyObject] parents] containsObject:parent], is(equalToBool(YES)));
     assertThatUnsignedInteger([[[parent.children anyObject] parents] count], is(equalToInt(1)));
+    
+    [mappingOperationDataSource.operationQueue waitUntilAllOperationsAreFinished];
 }
 
 - (void)testShouldConnectRelationshipsByPrimaryKeyRegardlessOfOrder