Skip to content

Commit ff88e09

Browse files
committed
test(files): restore the storage global after InitFileHandler
TestInitFileHandler_S3Configuration and TestInitFileHandler_LocalFilesystem replaced the package-level mem storage and never put it back, so any test ordered after them failed. Pre-existing; surfaced by running with -shuffle=on.
1 parent 71ab1d7 commit ff88e09

1 file changed

Lines changed: 3 additions & 31 deletions

File tree

pkg/files/s3_test.go

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -193,24 +193,7 @@ func TestFileStorageIntegration(t *testing.T) {
193193

194194
// TestInitFileHandler_S3Configuration tests S3 configuration validation
195195
func TestInitFileHandler_S3Configuration(t *testing.T) {
196-
// Save original config values
197-
originalType := config.FilesType.GetString()
198-
originalEndpoint := config.FilesS3Endpoint.GetString()
199-
originalBucket := config.FilesS3Bucket.GetString()
200-
originalRegion := config.FilesS3Region.GetString()
201-
originalAccessKey := config.FilesS3AccessKey.GetString()
202-
originalSecretKey := config.FilesS3SecretKey.GetString()
203-
204-
// Restore config after test
205-
defer func() {
206-
config.FilesType.Set(originalType)
207-
config.FilesS3Endpoint.Set(originalEndpoint)
208-
config.FilesS3Bucket.Set(originalBucket)
209-
config.FilesS3Region.Set(originalRegion)
210-
config.FilesS3AccessKey.Set(originalAccessKey)
211-
config.FilesS3SecretKey.Set(originalSecretKey)
212-
_ = InitFileHandler()
213-
}()
196+
resetFilesStateAfterTest(t)
214197

215198
t.Run("valid S3 configuration", func(t *testing.T) {
216199
config.FilesType.Set("s3")
@@ -282,22 +265,11 @@ func TestInitFileHandler_S3Configuration(t *testing.T) {
282265
}
283266

284267
func TestInitFileHandler_LocalFilesystem(t *testing.T) {
285-
// Save original config values
286-
originalType := config.FilesType.GetString()
287-
originalBasePath := config.FilesBasePath.GetString()
288-
289-
// Create a temp directory for the test
290-
tempDir := t.TempDir()
291-
292-
// Restore config after test
293-
defer func() {
294-
config.FilesType.Set(originalType)
295-
config.FilesBasePath.Set(originalBasePath)
296-
}()
268+
resetFilesStateAfterTest(t)
297269

298270
// Test with local filesystem using writable temp directory
299271
config.FilesType.Set("local")
300-
config.FilesBasePath.Set(tempDir)
272+
config.FilesBasePath.Set(t.TempDir())
301273

302274
// This should not return an error
303275
err := InitFileHandler()

0 commit comments

Comments
 (0)