Merge pull request #2937 from cfromknecht/moar-darwin-woes

lnd_test: bump timeout for darwin builds
This commit is contained in:
Johan T. Halseth 2019-04-12 15:31:42 +02:00 committed by GitHub
commit c0141a7bc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions

@ -9081,16 +9081,15 @@ func testBidirectionalAsyncPayments(net *lntest.NetworkHarness, t *harnessTest)
// Wait for Alice and Bob receive their payments, and throw and error // Wait for Alice and Bob receive their payments, and throw and error
// if something goes wrong. // if something goes wrong.
maxTime := 60 * time.Second
for i := 0; i < 2; i++ { for i := 0; i < 2; i++ {
select { select {
case err := <-errChan: case err := <-errChan:
if err != nil { if err != nil {
t.Fatalf(err.Error()) t.Fatalf(err.Error())
} }
case <-time.After(maxTime): case <-time.After(lntest.AsyncBenchmarkTimeout):
t.Fatalf("waiting for payments to finish too long "+ t.Fatalf("waiting for payments to finish too long "+
"(%v)", maxTime) "(%v)", lntest.AsyncBenchmarkTimeout)
} }
} }

@ -33,7 +33,7 @@ endif
ifneq ($(timeout),) ifneq ($(timeout),)
TEST_FLAGS += -test.timeout=$(timeout) TEST_FLAGS += -test.timeout=$(timeout)
else else
TEST_FLAGS += -test.timeout=20m TEST_FLAGS += -test.timeout=30m
endif endif
# UNIT_TARGTED is undefined iff a specific package and/or unit test case is # UNIT_TARGTED is undefined iff a specific package and/or unit test case is