mirror of https://github.com/linkerd/linkerd2.git
Fix dashboard integration test (#1160)
Signed-off-by: Kevin Lingerfelt <kl@buoyant.io>
This commit is contained in:
parent
46c99febf2
commit
9bfd8898e0
|
|
@ -141,7 +141,7 @@ func TestDashboard(t *testing.T) {
|
|||
}
|
||||
defer outputStream.Stop()
|
||||
|
||||
outputLines, err := outputStream.ReadUntil(5, 1*time.Minute)
|
||||
outputLines, err := outputStream.ReadUntil(4, 1*time.Minute)
|
||||
if err != nil {
|
||||
t.Fatalf("Error running command:\n%s", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -171,9 +171,9 @@ spec:
|
|||
spec:
|
||||
containers:
|
||||
- name: slow-cooker
|
||||
image: buoyantio/slow_cooker:1.1.0
|
||||
image: buoyantio/slow_cooker:1.1.1
|
||||
command:
|
||||
- "/bin/bash"
|
||||
- "/bin/sh"
|
||||
args:
|
||||
- "-c"
|
||||
- |
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ import (
|
|||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
// TestHelper provides helpers for running the conduit integration tests.
|
||||
|
|
@ -32,6 +34,7 @@ func NewTestHelper() *TestHelper {
|
|||
conduit := flag.String("conduit", "", "path to the conduit binary to test")
|
||||
namespace := flag.String("conduit-namespace", "conduit", "the namespace where conduit is installed")
|
||||
runTests := flag.Bool("integration-tests", false, "must be provided to run the integration tests")
|
||||
verbose := flag.Bool("verbose", false, "turn on debug logging")
|
||||
flag.Parse()
|
||||
|
||||
if !*runTests {
|
||||
|
|
@ -51,6 +54,12 @@ func NewTestHelper() *TestHelper {
|
|||
exit(1, "-conduit binary does not exist")
|
||||
}
|
||||
|
||||
if *verbose {
|
||||
log.SetLevel(log.DebugLevel)
|
||||
} else {
|
||||
log.SetLevel(log.PanicLevel)
|
||||
}
|
||||
|
||||
testHelper := &TestHelper{
|
||||
conduit: *conduit,
|
||||
namespace: *namespace,
|
||||
|
|
|
|||
Loading…
Reference in New Issue