DSET-2106: Fix flaky tests first (#21)

Author: martin-majlis-s1

Makefile

@@ -71,7 +71,7 @@ test-many-times:
 		grep -H FAIL out-test-$${i}.log; \
 		echo; \
 	done; \
-	echo "Grep for FAIL"; \
+	echo "Grep for FAIL - no lines should be found"; \
 	! grep -H FAIL out-test-*.log;
 
 foo:

pkg/buffer/buffer_test.go

@@ -227,7 +227,7 @@ func TestAddEventWithShouldSendAge(t *testing.T) {
 				break
 			}
 		}
-		assert.Greater(t, waited, 5)
+		assert.GreaterOrEqual(t, waited, 5)
 		finished.Add(1)
 	}()
 
@@ -266,7 +266,7 @@ func TestAddEventWithShouldSendSize(t *testing.T) {
 				break
 			}
 		}
-		assert.Greater(t, waited, 5)
+		assert.GreaterOrEqual(t, waited, 5)
 		finished.Add(1)
 	}()
 

pkg/client/add_events_test.go

@@ -564,9 +564,9 @@ func TestAddEventsWithBufferSweeper(t *testing.T) {
 	}(NumEvents)
 
 	// wait on all buffers to be sent
-	time.Sleep(sentDelay * NumEvents * 2)
+	time.Sleep(sentDelay * (NumEvents*2 + 1))
 
-	assert.Greater(t, attempt.Load(), int32(4))
+	assert.GreaterOrEqual(t, attempt.Load(), int32(4))
 	// info := httpmock.GetCallCountInfo()
 	// assert.CmpDeeply(info, map[string]int{"POST https://example.com/api/addEvents": int(attempt.Load())})
 }