From 72f1e1c3bb88cfc675704edb3cb423b67b5a6e07 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Wed, 9 Aug 2023 18:40:48 +0000 Subject: [PATCH 1/2] chore: use echo provisioners in logging tests --- cli/server_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cli/server_test.go b/cli/server_test.go index ee00499c4d2a6..8cbd3905e05a2 100644 --- a/cli/server_test.go +++ b/cli/server_test.go @@ -1309,6 +1309,7 @@ func TestServer(t *testing.T) { "--in-memory", "--http-address", ":0", "--access-url", "http://example.com", + "--provisioner-daemons-echo", "true", "--log-human", fiName, ) clitest.Start(t, root) @@ -1326,6 +1327,7 @@ func TestServer(t *testing.T) { "--in-memory", "--http-address", ":0", "--access-url", "http://example.com", + "--provisioner-daemons-echo", "true", "--log-human", fi, ) clitest.Start(t, root) @@ -1343,6 +1345,7 @@ func TestServer(t *testing.T) { "--in-memory", "--http-address", ":0", "--access-url", "http://example.com", + "--provisioner-daemons-echo", "true", "--log-json", fi, ) clitest.Start(t, root) @@ -1363,6 +1366,7 @@ func TestServer(t *testing.T) { "--in-memory", "--http-address", ":0", "--access-url", "http://example.com", + "--provisioner-daemons-echo", "true", "--log-stackdriver", fi, ) // Attach pty so we get debug output from the command if this test @@ -1397,6 +1401,7 @@ func TestServer(t *testing.T) { "--in-memory", "--http-address", ":0", "--access-url", "http://example.com", + "--provisioner-daemons-echo", "true", "--log-human", fi1, "--log-json", fi2, "--log-stackdriver", fi3, From 828459c575945fe37a3146895e6d0b19dd141fab Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Wed, 9 Aug 2023 18:49:05 +0000 Subject: [PATCH 2/2] fixup! chore: use echo provisioners in logging tests --- cli/server_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cli/server_test.go b/cli/server_test.go index 8cbd3905e05a2..ad971398c8e02 100644 --- a/cli/server_test.go +++ b/cli/server_test.go @@ -1309,7 +1309,7 @@ func TestServer(t *testing.T) { "--in-memory", "--http-address", ":0", "--access-url", "http://example.com", - "--provisioner-daemons-echo", "true", + "--provisioner-daemons-echo", "--log-human", fiName, ) clitest.Start(t, root) @@ -1327,7 +1327,7 @@ func TestServer(t *testing.T) { "--in-memory", "--http-address", ":0", "--access-url", "http://example.com", - "--provisioner-daemons-echo", "true", + "--provisioner-daemons-echo", "--log-human", fi, ) clitest.Start(t, root) @@ -1345,7 +1345,7 @@ func TestServer(t *testing.T) { "--in-memory", "--http-address", ":0", "--access-url", "http://example.com", - "--provisioner-daemons-echo", "true", + "--provisioner-daemons-echo", "--log-json", fi, ) clitest.Start(t, root) @@ -1366,7 +1366,7 @@ func TestServer(t *testing.T) { "--in-memory", "--http-address", ":0", "--access-url", "http://example.com", - "--provisioner-daemons-echo", "true", + "--provisioner-daemons-echo", "--log-stackdriver", fi, ) // Attach pty so we get debug output from the command if this test @@ -1401,7 +1401,7 @@ func TestServer(t *testing.T) { "--in-memory", "--http-address", ":0", "--access-url", "http://example.com", - "--provisioner-daemons-echo", "true", + "--provisioner-daemons-echo", "--log-human", fi1, "--log-json", fi2, "--log-stackdriver", fi3,