add more cancellation tests

This commit is contained in:
Adrien Delorme 2019-05-06 16:29:35 +02:00
parent 73a55631c4
commit cdbb742496
1 changed files with 22 additions and 20 deletions

View File

@ -27,26 +27,26 @@ func TestBuildCommand_RunContext_CtxCancel(t *testing.T) {
4, 4,
1, 1,
}, },
// {"cancel 1 locked build - debug - parallel=true", {"cancel 1 locked build - debug - parallel=true",
// []string{"-parallel=true", "-debug=true", filepath.Join(testFixture("parallel"), "1lock.json")}, []string{"-parallel=true", "-debug=true", filepath.Join(testFixture("parallel"), "1lock.json")},
// 5, 0,
// 1, 1,
// }, },
// {"cancel 2 locked builds - debug - parallel=true", {"cancel 2 locked builds - debug - parallel=true",
// []string{"-parallel=true", "-debug=true", filepath.Join(testFixture("parallel"), "2lock.json")}, []string{"-parallel=true", "-debug=true", filepath.Join(testFixture("parallel"), "2lock.json")},
// 4, 0,
// 1, 1,
// }, },
// {"cancel 1 locked build - debug - parallel=false", {"cancel 1 locked build - debug - parallel=false",
// []string{"-parallel=false", "-debug=true", filepath.Join(testFixture("parallel"), "1lock.json")}, []string{"-parallel=false", "-debug=true", filepath.Join(testFixture("parallel"), "1lock.json")},
// 5, 0,
// 1, 1,
// }, },
// {"cancel 2 locked builds - debug - parallel=false", {"cancel 2 locked builds - debug - parallel=false",
// []string{"-parallel=false", "-debug=true", filepath.Join(testFixture("parallel"), "2lock.json")}, []string{"-parallel=false", "-debug=true", filepath.Join(testFixture("parallel"), "2lock.json")},
// 4, 0,
// 1, 1,
// }, },
} }
for _, tt := range tests { for _, tt := range tests {
@ -64,7 +64,9 @@ func TestBuildCommand_RunContext_CtxCancel(t *testing.T) {
defer close(codeC) defer close(codeC)
codeC <- c.RunContext(ctx, tt.args) codeC <- c.RunContext(ctx, tt.args)
}() }()
t.Logf("waiting for passing tests if any")
b.wg.Wait() // ran `tt.parallelPassingTests` times b.wg.Wait() // ran `tt.parallelPassingTests` times
t.Logf("cancelling context")
cancelCtx() cancelCtx()
select { select {