linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert integration test check wait (#2400) 

linkerd/linkerd2#2360 modified the `linkerd check --wait` param from `0`
to `1m`. Waiting on a check command causes spinner control characters in
the output, making output validation non-trivial.

Instead, revert the wait param back to `0`, and use
`TestHelper.RetryFor`.

Signed-off-by: Andrew Seigner <siggy@buoyant.io>
This commit is contained in:
Andrew Seigner 2019-02-26 16:37:29 -08:00 committed by GitHub
parent 48e161f012
commit 10d9b7e493
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
test/install_test.go
View File

@ -131,21 +131,29 @@ func TestVersionPostInstall(t *testing.T) {
} }
func TestCheckPostInstall(t *testing.T) { func TestCheckPostInstall(t *testing.T) {
cmd := []string{"check", "--expected-version", TestHelper.GetVersion(), "--wait=1m"} cmd := []string{"check", "--expected-version", TestHelper.GetVersion(), "--wait=0"}
golden := "check.golden" golden := "check.golden"
if TestHelper.SingleNamespace() { if TestHelper.SingleNamespace() {
cmd = append(cmd, "--single-namespace") cmd = append(cmd, "--single-namespace")
golden = "check.single_namespace.golden" golden = "check.single_namespace.golden"
} }
out, _, err := TestHelper.LinkerdRun(cmd...)
if err != nil { err := TestHelper.RetryFor(time.Minute, func() error {
t.Fatalf("Check command failed\n%s", out) out, _, err := TestHelper.LinkerdRun(cmd...)
}
err = TestHelper.ValidateOutput(out, golden) if err != nil {
return fmt.Errorf("Check command failed\n%s", out)
}
err = TestHelper.ValidateOutput(out, golden)
if err != nil {
return fmt.Errorf("Received unexpected output\n%s", err.Error())
}
return nil
})
if err != nil { if err != nil {
t.Fatalf("Received unexpected output\n%s", err.Error()) t.Fatal(err.Error())
} }
} }
@ -229,20 +237,27 @@ func TestInject(t *testing.T) {
func TestCheckProxy(t *testing.T) { func TestCheckProxy(t *testing.T) {
prefixedNs := TestHelper.GetTestNamespace("smoke-test") prefixedNs := TestHelper.GetTestNamespace("smoke-test")
cmd := []string{"check", "--proxy", "--expected-version", TestHelper.GetVersion(), "--namespace", prefixedNs, "--wait=1m"} cmd := []string{"check", "--proxy", "--expected-version", TestHelper.GetVersion(), "--namespace", prefixedNs, "--wait=0"}
golden := "check.proxy.golden" golden := "check.proxy.golden"
if TestHelper.SingleNamespace() { if TestHelper.SingleNamespace() {
cmd = append(cmd, "--single-namespace") cmd = append(cmd, "--single-namespace")
golden = "check.proxy.single_namespace.golden" golden = "check.proxy.single_namespace.golden"
} }
out, _, err := TestHelper.LinkerdRun(cmd...)
if err != nil { err := TestHelper.RetryFor(time.Minute, func() error {
t.Fatalf("Check command failed\n%s", out) out, _, err := TestHelper.LinkerdRun(cmd...)
} if err != nil {
return fmt.Errorf("Check command failed\n%s", out)
}
err = TestHelper.ValidateOutput(out, golden) err = TestHelper.ValidateOutput(out, golden)
if err != nil {
return fmt.Errorf("Received unexpected output\n%s", err.Error())
}
return nil
})
if err != nil { if err != nil {
t.Fatalf("Received unexpected output\n%s", err.Error()) t.Fatal(err.Error())
} }
} }