Remove reference to runIOTestsLocal function that is no longer used or needed. Move gs-specific test to gs conformance test

Author: funkyshu

backend/gs/conformance_test.go

@@ -6,7 +6,11 @@ import (
 	"os"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/c2fo/vfs/v7/backend/testsuite"
+	"github.com/c2fo/vfs/v7/utils"
 )
 
 // TestConformance runs the VFS conformance test suite against the GCS backend.
@@ -56,3 +60,57 @@ func TestIOConformance(t *testing.T) {
 
 	testsuite.RunIOTests(t, location)
 }
+
+// TestPersistentFolderHandling tests GCS-specific handling of persistent "folders".
+// When a persistent "folder" is created through the UI, it creates a zero-length object
+// with a trailing "/". The UI or gsutil interprets these as folders but they are still
+// just objects. List() should ignore these objects.
+func TestPersistentFolderHandling(t *testing.T) {
+	bucket := os.Getenv("VFS_GS_BUCKET")
+	if bucket == "" {
+		t.Skip("VFS_GS_BUCKET not set, skipping GCS persistent folder test")
+	}
+
+	testPath := os.Getenv("VFS_GS_TEST_PATH")
+	if testPath == "" {
+		testPath = "/vfs-integration-test/"
+	}
+
+	fs := NewFileSystem()
+	baseLoc, err := fs.NewLocation(bucket, testPath)
+	require.NoError(t, err)
+
+	// Get client since VFS doesn't allow a File ending with a slash
+	client, err := fs.Client()
+	require.NoError(t, err)
+
+	objHandle := client.
+		Bucket(bucket).
+		Object(utils.RemoveLeadingSlash(baseLoc.Path() + "myfolder/"))
+
+	ctx := t.Context()
+
+	// Write zero-length object to simulate persistent folder
+	writer := objHandle.NewWriter(ctx)
+	_, err = writer.Write([]byte(""))
+	require.NoError(t, err)
+	require.NoError(t, writer.Close())
+
+	// Create a file inside the "folder"
+	f, err := baseLoc.NewFile("myfolder/file.txt")
+	require.NoError(t, err)
+
+	_, err = f.Write([]byte("some text"))
+	require.NoError(t, err)
+	require.NoError(t, f.Close())
+
+	// List "folder" should only return file.txt, not the zero-length folder object
+	files, err := f.Location().List()
+	require.NoError(t, err)
+	assert.Len(t, files, 1, "check file count found")
+	assert.Equal(t, "file.txt", files[0], "file.txt was found")
+
+	// Clean up
+	require.NoError(t, f.Delete(), "clean up file.txt")
+	require.NoError(t, objHandle.Delete(ctx))
+}

backend/testsuite/backend_integration_test.go

@@ -16,9 +16,7 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	"github.com/c2fo/vfs/v7"
-	"github.com/c2fo/vfs/v7/backend/gs"
 	_ "github.com/c2fo/vfs/v7/backend/all" // register all core backends
-	"github.com/c2fo/vfs/v7/utils"
 	"github.com/c2fo/vfs/v7/vfssimple"
 )
 
@@ -67,68 +65,12 @@ func (s *vfsTestSuite) TestScheme() {
 		}
 
 		// Run the exported conformance tests
-		s.T().Run(scheme, func(t *testing.T) {
-			RunConformanceTests(t, location, opts)
+		s.Run(scheme, func() {
+			RunConformanceTests(s.T(), location, opts)
 		})
-
-		// Run GS-specific tests if applicable
-		if scheme == "gs" {
-			s.gsList(location)
-		}
 	}
 }
 
-// gsList is a GS-specific test for handling persistent "folders"
-func (s *vfsTestSuite) gsList(baseLoc vfs.Location) {
-	/*
-		test description:
-			When a persistent "folder" is created through the UI, it simply creates a zero length object
-			with a trailing "/". The UI or gsutil knows to interpret these objects as folders but they are
-			still just objects.  List(), in its current state, should ignore these objects.
-
-		If we create the following objects:
-			gs://bucket/some/path/to/myfolder/         -- Note that object base name is "myfolder/"
-			gs://bucket/some/path/to/myfolder/file.txt
-
-		List() from location "gs://bucket/some/path/to/myfolder/" should only return object name "file.txt";
-		"myfolder/" should be ignored.
-	*/
-
-	// getting client since VFS doesn't allow a File ending with a slash
-	client, err := baseLoc.FileSystem().(*gs.FileSystem).Client()
-	s.Require().NoError(err)
-
-	objHandle := client.
-		Bucket("enterprise-test").
-		Object(utils.RemoveLeadingSlash(baseLoc.Path() + "myfolder/"))
-
-	ctx := s.T().Context()
-
-	// write zero length object
-	writer := objHandle.NewWriter(ctx)
-	_, err = writer.Write([]byte(""))
-	s.Require().NoError(err)
-	s.Require().NoError(writer.Close())
-
-	// create a file inside the "folder"
-	f, err := baseLoc.NewFile("myfolder/file.txt")
-	s.Require().NoError(err)
-
-	_, err = f.Write([]byte("some text"))
-	s.Require().NoError(err)
-	s.Require().NoError(f.Close())
-
-	// list "folder" should only return file.txt
-	files, err := f.Location().List()
-	s.Require().NoError(err)
-	s.Len(files, 1, "check file count found")
-	s.Equal("file.txt", files[0], "file.txt was found")
-
-	// CLEAN UP
-	s.Require().NoError(f.Delete(), "clean up file.txt")
-	s.Require().NoError(objHandle.Delete(ctx))
-}
-
 func TestVFS(t *testing.T) {
 	suite.Run(t, new(vfsTestSuite))
 }

backend/testsuite/io_integration_test.go

@@ -21,53 +21,40 @@ import (
 type ioTestSuite struct {
 	suite.Suite
 	testLocations map[string]vfs.Location
-	localDir      string
 }
 
 func (s *ioTestSuite) SetupSuite() {
-	uris := make([]string, 0)
-
 	// add VFS_INTEGRATION_LOCATIONS tests
-	locs := os.Getenv("VFS_INTEGRATION_LOCATIONS")
-	uris = append(uris, strings.Split(locs, ";")...)
+	uris := strings.Split(os.Getenv("VFS_INTEGRATION_LOCATIONS"), ";")
 
 	s.testLocations = make(map[string]vfs.Location)
 	for idx := range uris {
 		if uris[idx] == "" {
 			continue
 		}
-		if strings.HasPrefix(uris[idx], "/") {
-			s.localDir = uris[idx]
-		} else {
-			l, err := vfssimple.NewLocation(uris[idx])
-			s.Require().NoError(err)
+		l, err := vfssimple.NewLocation(uris[idx])
+		s.Require().NoError(err)
 
-			// For file:// locations, ensure directory exists
-			if l.FileSystem().Scheme() == "file" {
-				exists, err := l.Exists()
+		// For file:// locations, ensure directory exists
+		if l.FileSystem().Scheme() == "file" {
+			exists, err := l.Exists()
+			if err != nil {
+				panic(err)
+			}
+			if !exists {
+				err := os.Mkdir(l.Path(), 0750)
 				if err != nil {
 					panic(err)
 				}
-				if !exists {
-					err := os.Mkdir(l.Path(), 0750)
-					if err != nil {
-						panic(err)
-					}
-				}
 			}
-
-			// Store location by scheme - no type assertion needed
-			s.testLocations[l.FileSystem().Scheme()] = l
 		}
+
+		// Store location by scheme - no type assertion needed
+		s.testLocations[l.FileSystem().Scheme()] = l
 	}
 }
 
 func (s *ioTestSuite) TestFileOperations() {
-	if s.localDir != "" {
-		s.Run("local_baseline", func() {
-			runIOTestsLocal(s.T(), s.localDir, DefaultIOTestCases())
-		})
-	}
 	for scheme, location := range s.testLocations {
 		s.Run(scheme, func() {
 			RunIOTests(s.T(), location)