undo testing changes

Signed-off-by: Arjun Raja Yogidas <[email protected]>

Author: coderbirju

.github/workflows/build.yml

@@ -47,9 +47,4 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
-      # - run: wget https://github.com/containerd/nerdctl/releases/download/v1.7.6/nerdctl-1.7.6-linux-amd64.tar.gz
-      # - run: sudo tar Cxzvf /usr/local/bin nerdctl-1.7.6-linux-amd64.tar.gz
-      # - run: sudo apt -y update && sudo apt -y upgrade && sudo apt-get -y install gcc-multilib
-      # - run: uname -a
-      # - run: GO_TEST_FLAGS="-run TestLazyPullWithSparseIndex -count=1" make integration
-      - run: GO_TEST_FLAGS="-short -count=1" make integration
+      - run: make integration

Dockerfile

@@ -35,8 +35,7 @@ RUN apk add --no-cache \
     libc6-compat \
     libseccomp-dev \
     pigz \
-    zlib-dev \
-    strace 
+    zlib-dev
 RUN cp $GOPATH/src/github.com/awslabs/soci-snapshotter/out/soci /usr/local/bin/ && \
     cp $GOPATH/src/github.com/awslabs/soci-snapshotter/out/soci-snapshotter-grpc /usr/local/bin/ && \
     mkdir /etc/soci-snapshotter-grpc && \

fs/layer/node.go

@@ -303,8 +303,6 @@ func (n *node) Readdir(ctx context.Context) (fusefs.DirStream, syscall.Errno) {
 	if errno != 0 {
 		return nil, errno
 	}
-
-	log.G(ctx).Debugf("Inside Readdir : %+v\n", ents)
 	return fusefs.NewListDirStream(ents), 0
 }
 
@@ -543,8 +541,6 @@ func (n *node) Listxattr(ctx context.Context, dest []byte) (uint32, syscall.Errn
 	for k := range ent.Xattrs {
 		attrs = append(attrs, []byte(k+"\x00")...)
 	}
-
-	log.G(ctx).Debugf("Inside Listxattr : %+v\n", ent)
 	if len(dest) < len(attrs) {
 		return uint32(len(attrs)), syscall.ERANGE
 	}

integration/metrics_test.go

@@ -143,10 +143,6 @@ func TestOverlayFallbackMetric(t *testing.T) {
 }
 
 func TestFuseOperationFailureMetrics(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping testing in short mode")
-	}
-
 	const logFuseOperationConfig = `
 [fuse]
 log_fuse_operations = true
@@ -401,9 +397,6 @@ func checkFuseOperationFailureMetrics(t *testing.T, output string, metricToCheck
 	metricCountSum := 0
 
 	lines := strings.Split(output, "\n")
-	// t.Log("\n---------------------------- printinf outpurt of lines------------------------- \n")
-	// t.Log(output)
-	// t.Log("\n---------------------------- end------------------------- \n")
 	for _, line := range lines {
 		// skip non-fuse and fuse_mount_failure_count metrics
 		if !strings.Contains(line, "fuse") || strings.Contains(line, commonmetrics.FuseMountFailureCount) {

integration/util_soci_test.go

@@ -160,7 +160,6 @@ func buildIndex(sh *shell.Shell, src imageInfo, opt ...indexBuildOption) string
 		"--platform", platforms.Format(src.platform), // this will make SOCI artifact available locally
 	)
 	if err != nil {
-		fmt.Println("error  line 163:", err)
 		return ""
 	}
 

integration/util_test.go

@@ -717,22 +717,13 @@ func rebootContainerd(t *testing.T, sh *shell.Shell, customContainerdConfig, cus
 	sh.Gox(containerdCmds...)
 	snapshotterCmds := shell.C("/usr/local/bin/soci-snapshotter-grpc", "--log-level", sociLogLevel,
 		"--address", snapshotterSocket)
-
 	if customSnapshotterConfig != "" {
 		snapshotterCmds = addConfig(t, sh, customSnapshotterConfig, snapshotterCmds...)
 	}
 	outR, errR, err := sh.R(snapshotterCmds...)
 	if err != nil {
 		t.Fatalf("failed to create pipe: %v", err)
 	}
-	time.Sleep(2 * time.Second)
-	pids, err := sh.OLog("pgrep", "-f", "soci")
-	t.Log(string(pids))
-	if err != nil {
-		t.Fatal(err)
-	}
-	// sh.Gox("strace", "-f", "-p", string(pids))
-
 	reporter := testutil.NewTestingReporter(t)
 	var m *testutil.LogMonitor = testutil.NewLogMonitor(reporter, outR, errR)