Merge pull request kcp-dev#1093 from stevekuznetsov/skuznets/quiet-do…

…wn-e2e test/e2e: quiet down spammy log messages
paulcastro · May 18, 2022 · 3b62a46 · 3b62a46
2 parents 5056e7b + 1c2dcde
commit 3b62a46
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/test/e2e/framework/fixture.go b/test/e2e/framework/fixture.go
@@ -419,16 +419,13 @@ func (sf SyncerFixture) Start(t *testing.T) *StartedSyncerFixture {
 		gather := func(client dynamic.Interface, gvr schema.GroupVersionResource) {
 			resourceClient := client.Resource(gvr)
 
-			t.Logf("gathering %q", gvr)
 			list, err := resourceClient.List(ctx, metav1.ListOptions{})
 			if err != nil {
 				// Don't fail the test
 				t.Logf("Error gathering %s: %v", gvr, err)
 				return
 			}
 
-			t.Logf("got %d items", len(list.Items))
-
 			for i := range list.Items {
 				item := list.Items[i]
 				sf.UpstreamServer.Artifact(t, func() (runtime.Object, error) {
@@ -757,7 +754,9 @@ func Kubectl(t *testing.T, kubeconfigPath string, args ...string) []byte {
 	t.Logf("running: %s", strings.Join(cmdParts, " "))
 
 	output, err := cmd.CombinedOutput()
-	t.Logf("kubectl apply output:\n%s", output)
+	if err != nil {
+		t.Logf("kubectl output:\n%s", output)
+	}
 	require.NoError(t, err)
 
 	return output

diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go
@@ -202,7 +202,6 @@ func artifact(t *testing.T, server RunningServer, producer func() (runtime.Objec
 		gvkForFilename := fmt.Sprintf("%s_%s", group, gvk.Kind)
 
 		file := path.Join(dir, fmt.Sprintf("%s-%s.yaml", gvkForFilename, accessor.GetName()))
-		t.Logf("saving artifact to %s", file)
 
 		serializer := json.NewSerializerWithOptions(json.DefaultMetaFactory, scheme.Scheme, scheme.Scheme, json.SerializerOptions{Yaml: true})
 		raw := bytes.Buffer{}

diff --git a/test/e2e/virtual/syncer/virtualworkspace_test.go b/test/e2e/virtual/syncer/virtualworkspace_test.go
@@ -37,7 +37,6 @@ import (
 	kubernetesclientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/klog/v2"
 	"sigs.k8s.io/yaml"
 
 	kubefixtures "github.com/kcp-dev/kcp/test/e2e/fixtures/kube"
@@ -258,8 +257,6 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
 					luckyluke, err := wildwestWorkspaceClient.WildwestV1alpha1().Cowboys("default").Get(ctx, "luckyluke", metav1.GetOptions{})
 					require.NoError(t, err)
 
-					klog.Infof("luckyluke: %v", toYAML(t, luckyluke))
-
 					return luckyluke.GetLabels()[fmt.Sprintf("state.internal.workloads.kcp.dev/%s", wildwestWorkloadClusterName)] == "Sync"
 				}, wait.ForeverTestTimeout, time.Millisecond*100)