From ccf393f6fa4a062cea42bd593c0c20e4783d4ffe Mon Sep 17 00:00:00 2001
From: Ivan Matkov <v-ivmatk@microsoft.com>
Date: Mon, 19 Jun 2017 17:41:21 +0300
Subject: [PATCH] Use travis_retry to sure that tests really fails

---
 .travis.yml                                         | 2 +-
 Support/HockeySDKTests/BITStoreUpdateManagerTests.m | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9d317c0dea..5470e29fe9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ script:
   # Run tests
   - if [ $RUN_TESTS == "YES" ]; then
       COMMAND+=" -destination '$DESTINATION' XCODEBUILD_GCC_PREPROCESSOR_DEFINITIONS=\"CI=1\" "
-      COMMAND="$COMMAND clean build-for-testing $COMMAND_SUFFIX && $COMMAND test-without-building $COMMAND_SUFFIX";
+      COMMAND="$COMMAND clean build-for-testing $COMMAND_SUFFIX && travis_retry $COMMAND test-without-building $COMMAND_SUFFIX";
     else
       COMMAND+="$COMMAND_SUFFIX";
     fi
diff --git a/Support/HockeySDKTests/BITStoreUpdateManagerTests.m b/Support/HockeySDKTests/BITStoreUpdateManagerTests.m
index 7e43b383eb..c196846dde 100644
--- a/Support/HockeySDKTests/BITStoreUpdateManagerTests.m
+++ b/Support/HockeySDKTests/BITStoreUpdateManagerTests.m
@@ -203,7 +203,6 @@
 
 - (void)testFirstStartHasNewVersionReturnsFalseWithFirstCheck {
   NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:anything()]) willReturn:nil];
   _storeUpdateManager.userDefaults = mockUserDefaults;
   
   [self startManager];
@@ -217,7 +216,6 @@
 
 - (void)testFirstStartHasNewVersionReturnsFalseWithSameVersion {
   NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:anything()]) willReturn:nil];
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastStoreVersion"]) willReturn:@"4.1.2"];
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastUUID"]) willReturn:@""];
   _storeUpdateManager.userDefaults = mockUserDefaults;
@@ -234,7 +232,6 @@
 
 - (void)testFirstStartHasNewVersionReturnsFalseWithSameVersionButDifferentUUID {
   NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:anything()]) willReturn:nil];
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastStoreVersion"]) willReturn:@"4.1.2"];
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastUUID"]) willReturn:@"1"];
   _storeUpdateManager.userDefaults = mockUserDefaults;
@@ -250,7 +247,6 @@
 
 - (void)testFirstStartHasNewVersionReturnsTrue {
   NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:anything()]) willReturn:nil];
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastStoreVersion"]) willReturn:@"4.1.1"];
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastUUID"]) willReturn:@""];
   _storeUpdateManager.userDefaults = mockUserDefaults;
@@ -267,7 +263,6 @@
 
 - (void)testFirstStartHasNewVersionReturnsFalseBecauseWeHaveANewerVersionInstalled {
   NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:anything()]) willReturn:nil];
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastStoreVersion"]) willReturn:@"4.1.3"];
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastUUID"]) willReturn:@""];
   _storeUpdateManager.userDefaults = mockUserDefaults;
@@ -283,7 +278,6 @@
 
 - (void)testReportedVersionIsBeingIgnored {
   NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:anything()]) willReturn:nil];
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastStoreVersion"]) willReturn:@"4.1.1"];
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastUUID"]) willReturn:@""];
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateIgnoredVersion"]) willReturn:@"4.1.2"];
@@ -300,7 +294,6 @@
 
 - (void)testReportedVersionIsNewerThanTheIgnoredVersion {
   NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:anything()]) willReturn:nil];
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastStoreVersion"]) willReturn:@"4.1.1"];
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastUUID"]) willReturn:@""];
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateIgnoredVersion"]) willReturn:@"4.1.1"];