From e724886ad5b20aa1d0211098e62223ef4872c2f8 Mon Sep 17 00:00:00 2001 From: "Jeremy L. Morris" Date: Sat, 17 Feb 2018 22:25:38 -0500 Subject: [PATCH] Removed newlines from e2e log statements. --- test/e2e/e2e.go | 4 ++-- test/e2e/instrumentation/monitoring/accelerator.go | 2 +- test/e2e/scheduling/ubernetes_lite_volumes.go | 2 +- test/e2e_node/container_manager_test.go | 4 ++-- test/e2e_node/density_test.go | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index bb57e7e6b1..ae41041759 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -56,7 +56,7 @@ func setupProviderConfig() error { glog.Info("The --provider flag is not set. Treating as a conformance test. Some tests may not be run.") case "gce", "gke": - framework.Logf("Fetching cloud provider for %q\r\n", framework.TestContext.Provider) + framework.Logf("Fetching cloud provider for %q\r", framework.TestContext.Provider) zone := framework.TestContext.CloudConfig.Zone region := framework.TestContext.CloudConfig.Region @@ -295,7 +295,7 @@ func gatherTestSuiteMetrics() error { return fmt.Errorf("error writing to %q: %v", filePath, err) } } else { - framework.Logf("\n\nTest Suite Metrics:\n%s\n\n", metricsJSON) + framework.Logf("\n\nTest Suite Metrics:\n%s\n", metricsJSON) } return nil diff --git a/test/e2e/instrumentation/monitoring/accelerator.go b/test/e2e/instrumentation/monitoring/accelerator.go index 8205365069..66cc8ae824 100644 --- a/test/e2e/instrumentation/monitoring/accelerator.go +++ b/test/e2e/instrumentation/monitoring/accelerator.go @@ -103,7 +103,7 @@ func testStackdriverAcceleratorMonitoring(f *framework.Framework) { pollingFunction := checkForAcceleratorMetrics(projectId, gcmService, time.Now(), metricsMap) err = wait.Poll(pollFrequency, pollTimeout, pollingFunction) if err != nil { - framework.Logf("Missing metrics: %+v\n", metricsMap) + framework.Logf("Missing metrics: %+v", metricsMap) } framework.ExpectNoError(err) } diff --git a/test/e2e/scheduling/ubernetes_lite_volumes.go b/test/e2e/scheduling/ubernetes_lite_volumes.go index ba3f7d8272..7d7e95687e 100644 --- a/test/e2e/scheduling/ubernetes_lite_volumes.go +++ b/test/e2e/scheduling/ubernetes_lite_volumes.go @@ -65,7 +65,7 @@ func OnlyAllowNodeZones(f *framework.Framework, zoneCount int, image string) { // Get all the zones that the nodes are in expectedZones, err := gceCloud.GetAllZonesFromCloudProvider() Expect(err).NotTo(HaveOccurred()) - framework.Logf("Expected zones: %v\n", expectedZones) + framework.Logf("Expected zones: %v", expectedZones) // Get all the zones in this current region region := gceCloud.Region() diff --git a/test/e2e_node/container_manager_test.go b/test/e2e_node/container_manager_test.go index 7e48e445fd..71a011045e 100644 --- a/test/e2e_node/container_manager_test.go +++ b/test/e2e_node/container_manager_test.go @@ -161,9 +161,9 @@ var _ = framework.KubeDescribe("Container Manager Misc [Serial]", func() { }, }) Expect(err).NotTo(HaveOccurred()) - framework.Logf("Running containers:\n") + framework.Logf("Running containers:") for _, c := range containers { - framework.Logf("%+v\n", c) + framework.Logf("%+v", c) } } }) diff --git a/test/e2e_node/density_test.go b/test/e2e_node/density_test.go index e26a4d5991..592a5f86bb 100644 --- a/test/e2e_node/density_test.go +++ b/test/e2e_node/density_test.go @@ -198,7 +198,7 @@ var _ = framework.KubeDescribe("Density [Serial] [Slow]", func() { // Here we set API QPS limit from default 5 to 60 in order to test real Kubelet performance. // Note that it will cause higher resource usage. tempSetCurrentKubeletConfig(f, func(cfg *kubeletconfig.KubeletConfiguration) { - framework.Logf("Old QPS limit is: %d\n", cfg.KubeAPIQPS) + framework.Logf("Old QPS limit is: %d", cfg.KubeAPIQPS) // Set new API QPS limit cfg.KubeAPIQPS = int32(itArg.APIQPSLimit) })