Re: [PATCH v4 3/4] git-p4: retry kill/cleanup operations in tests with timeout

On 06 Nov 2015, at 10:28, Eric Sunshine [off-list ref] wrote:

On Fri, Nov 6, 2015 at 3:58 AM,  [off-list ref] wrote:

quoted

In rare cases kill/cleanup operations in tests fail. Retry these
operations with a timeout to make the test less flaky.

Signed-off-by: Lars Schneider <redacted>
---

diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
+retry_until_success() {
+    timeout=$(($(date +%s) + $RETRY_TIMEOUT))
+    until "$@" 2>/dev/null || test $(date +%s) -gt $timeout
+    do :
+    done
+}
+
+retry_until_fail() {
+    timeout=$(($(date +%s) + $RETRY_TIMEOUT))
+    until ! "$@" 2>/dev/null || test $(date +%s) -gt $timeout
+    do :
+    done
+}

I'm confused by this. Patch 2/4 was already calling
retry_until_fail(), but it's introduction seems to be here in patch
3/4. Am I missing something obvious?

No, my fault. I reordered the commits and forgot about this. I will fix the order in the next roll.

Thanks,
Lars