Skip to content

Commit

Permalink
test: RuntimeKVStoreTest: Log cilium-agent execution
Browse files Browse the repository at this point in the history
[ upstream commit 53227cd ]

For KV store tests, we execute cilium-agent as a standalone binary, in
which case logs are printed to stdout. For the Consul KV store, however,
we never append stdout to system logs, so logs for that test are not
preserved.

The Etcd test was fixed in 8864c72, but the Consul test was apparently
overlooked.

Fixes: f0741a6 ("Tests: Ginkgo test framework")
Signed-off-by: Paul Chaignon <paul@cilium.io>
  • Loading branch information
pchaigno committed Jul 21, 2020
1 parent 97e2582 commit 1d61e9d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/runtime/kvstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ var _ = Describe("RuntimeKVStoreTest", func() {
By("Starting Cilium with consul as kvstore")
vm.ExecInBackground(
ctx,
"sudo cilium-agent --kvstore consul --kvstore-opt consul.address=127.0.0.1:8500 --debug")
"sudo cilium-agent --kvstore consul --kvstore-opt consul.address=127.0.0.1:8500 --debug 2>&1 | logger -t cilium")
err := vm.WaitUntilReady(helpers.CiliumStartTimeout)
Expect(err).Should(BeNil())

Expand All @@ -96,7 +96,7 @@ var _ = Describe("RuntimeKVStoreTest", func() {
By("Starting Cilium with etcd as kvstore")
vm.ExecInBackground(
ctx,
"sudo cilium-agent --kvstore etcd --kvstore-opt etcd.address=127.0.0.1:4001 2>&1 | logger -t cilium")
"sudo cilium-agent --kvstore etcd --kvstore-opt etcd.address=127.0.0.1:4001 --debug 2>&1 | logger -t cilium")
err := vm.WaitUntilReady(helpers.CiliumStartTimeout)
Expect(err).Should(BeNil(), "Timed out waiting for VM to be ready after restarting Cilium")

Expand Down

0 comments on commit 1d61e9d

Please sign in to comment.