Double dry-run time limit, add logging

pull/6370/head
tstromberg 2020-01-22 12:14:05 -08:00
parent abfcf79dfd
commit 4be56d6d31
1 changed files with 5 additions and 5 deletions

View File

@ -303,12 +303,12 @@ func validateDNS(ctx context.Context, t *testing.T, profile string) {
// validateDryRun asserts that the dry-run mode quickly exits with the right code // validateDryRun asserts that the dry-run mode quickly exits with the right code
func validateDryRun(ctx context.Context, t *testing.T, profile string) { func validateDryRun(ctx context.Context, t *testing.T, profile string) {
// dry-run mode should always be able to finish quickly // dry-run mode should always be able to finish quickly (<5s)
mctx, cancel := context.WithTimeout(ctx, 2*time.Second) mctx, cancel := context.WithTimeout(ctx, 4*time.Second)
defer cancel() defer cancel()
// Too little memory! // Too little memory!
startArgs := append([]string{"start", "-p", profile, "--dry-run", "--memory", "250MB"}, StartArgs()...) startArgs := append([]string{"start", "-p", profile, "--dry-run", "--memory", "250MB", "--alsologtostderr", "-v=1"}, StartArgs()...)
c := exec.CommandContext(mctx, Target(), startArgs...) c := exec.CommandContext(mctx, Target(), startArgs...)
rr, err := Run(t, c) rr, err := Run(t, c)
@ -317,9 +317,9 @@ func validateDryRun(ctx context.Context, t *testing.T, profile string) {
t.Errorf("dry-run(250MB) exit code = %d, wanted = %d: %v", rr.ExitCode, wantCode, err) t.Errorf("dry-run(250MB) exit code = %d, wanted = %d: %v", rr.ExitCode, wantCode, err)
} }
dctx, cancel := context.WithTimeout(ctx, 2*time.Second) dctx, cancel := context.WithTimeout(ctx, 4*time.Second)
defer cancel() defer cancel()
startArgs = append([]string{"start", "-p", profile, "--dry-run"}, StartArgs()...) startArgs = append([]string{"start", "-p", profile, "--dry-run", "--alsologtostderr", "-v=1"}, StartArgs()...)
c = exec.CommandContext(dctx, Target(), startArgs...) c = exec.CommandContext(dctx, Target(), startArgs...)
rr, err = Run(t, c) rr, err = Run(t, c)
if rr.ExitCode != 0 || err != nil { if rr.ExitCode != 0 || err != nil {