akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make+itest: allow the same test to be run in parallel

Browse Source
This commit is contained in:
Oliver Gugger 2020-11-07 13:23:30 +01:00
parent 72cacb9c5e
commit 47e8882480
No known key found for this signature in database
GPG Key ID: 8E4256593F177720
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -184,7 +184,7 @@ itest-parallel: btcd
@$(call print, "Running tests") @$(call print, "Running tests")
rm -rf lntest/itest/*.log lntest/itest/.logs-* rm -rf lntest/itest/*.log lntest/itest/.logs-*
echo -n "$$(seq 0 $$(expr $(NUM_ITEST_TRANCHES) - 1))" | xargs -P $(NUM_ITEST_TRANCHES) -n 1 -I {} scripts/itest_part.sh {} $(NUM_ITEST_TRANCHES) $(TEST_FLAGS) echo "$$(seq 0 $$(expr $(ITEST_PARALLELISM) - 1))" | xargs -P $(ITEST_PARALLELISM) -n 1 -I {} scripts/itest_part.sh {} $(NUM_ITEST_TRANCHES) $(TEST_FLAGS)
itest-parallel-windows: btcd itest-parallel-windows: btcd
@$(call print, "Building lnd binary") @$(call print, "Building lnd binary")
@ -194,7 +194,7 @@ itest-parallel-windows: btcd
CGO_ENABLED=0 $(GOTEST) -v ./lntest/itest -tags="$(DEV_TAGS) $(RPC_TAGS) rpctest $(backend)" -logoutput -goroutinedump -c -o lntest/itest/itest.test.exe CGO_ENABLED=0 $(GOTEST) -v ./lntest/itest -tags="$(DEV_TAGS) $(RPC_TAGS) rpctest $(backend)" -logoutput -goroutinedump -c -o lntest/itest/itest.test.exe
@$(call print, "Running tests") @$(call print, "Running tests")
EXEC_SUFFIX=".exe" echo -n "$$(seq 0 $$(expr $(NUM_ITEST_TRANCHES) - 1))" | xargs -P $(NUM_ITEST_TRANCHES) -n 1 -I {} scripts/itest_part.sh {} $(NUM_ITEST_TRANCHES) $(TEST_FLAGS) EXEC_SUFFIX=".exe" echo "$$(seq 0 $$(expr $(ITEST_PARALLELISM) - 1))" | xargs -P $(ITEST_PARALLELISM) -n 1 -I {} scripts/itest_part.sh {} $(NUM_ITEST_TRANCHES) $(TEST_FLAGS)
itest-windows: btcd build-itest-windows itest-only itest-windows: btcd build-itest-windows itest-only
@ -232,6 +232,10 @@ flake-unit:
@$(call print, "Flake hunting unit tests.") @$(call print, "Flake hunting unit tests.")
while [ $$? -eq 0 ]; do GOTRACEBACK=all $(UNIT) -count=1; done while [ $$? -eq 0 ]; do GOTRACEBACK=all $(UNIT) -count=1; done
flakehunter-parallel:
@$(call print, "Flake hunting ${backend} integration tests in parallel.")
while [ $$? -eq 0 ]; do make itest-parallel tranches=1 parallel=${ITEST_PARALLELISM} icase='${icase}' backend='${backend}'; done
# ============= # =============
# FUZZING # FUZZING
# ============= # =============

11
lntest/itest/lnd_test.go
View File

@ -96,6 +96,15 @@ func getTestCaseSplitTranche() ([]*testCase, uint, uint) {
runTranche = *testCasesRunTranche runTranche = *testCasesRunTranche
} }
// There's a special flake-hunt mode where we run the same test multiple
// times in parallel. In that case the tranche index is equal to the
// thread ID, but we need to actually run all tests for the regex
// selection to work.
threadID := runTranche
if numTranches == 1 {
runTranche = 0
}
numCases := uint(len(allTestCases)) numCases := uint(len(allTestCases))
testsPerTranche := numCases / numTranches testsPerTranche := numCases / numTranches
trancheOffset := runTranche * testsPerTranche trancheOffset := runTranche * testsPerTranche
@ -104,7 +113,7 @@ func getTestCaseSplitTranche() ([]*testCase, uint, uint) {
trancheEnd = numCases trancheEnd = numCases
} }
return allTestCases[trancheOffset:trancheEnd], runTranche, trancheOffset return allTestCases[trancheOffset:trancheEnd], threadID, trancheOffset
} }
func rpcPointToWirePoint(t *harnessTest, chanPoint *lnrpc.ChannelPoint) wire.OutPoint { func rpcPointToWirePoint(t *harnessTest, chanPoint *lnrpc.ChannelPoint) wire.OutPoint {

7
make/testing_flags.mk
View File

@ -4,6 +4,7 @@ LOG_TAGS =
TEST_FLAGS = TEST_FLAGS =
COVER_PKG = $$(go list -deps ./... | grep '$(PKG)' | grep -v lnrpc) COVER_PKG = $$(go list -deps ./... | grep '$(PKG)' | grep -v lnrpc)
NUM_ITEST_TRANCHES = 6 NUM_ITEST_TRANCHES = 6
ITEST_PARALLELISM = $(NUM_ITEST_TRANCHES)
# If rpc option is set also add all extra RPC tags to DEV_TAGS # If rpc option is set also add all extra RPC tags to DEV_TAGS
ifneq ($(with-rpc),) ifneq ($(with-rpc),)
@ -13,6 +14,12 @@ endif
# Scale the number of parallel running itest tranches. # Scale the number of parallel running itest tranches.
ifneq ($(tranches),) ifneq ($(tranches),)
NUM_ITEST_TRANCHES = $(tranches) NUM_ITEST_TRANCHES = $(tranches)
ITEST_PARALLELISM = $(NUM_ITEST_TRANCHES)
endif
# Give the ability to run the same tranche multiple times at the same time.
ifneq ($(parallel),)
ITEST_PARALLELISM = $(parallel)
endif endif
# If specific package is being unit tested, construct the full name of the # If specific package is being unit tested, construct the full name of the