Skip to content

Commit 1ab1f07

Browse files
PranjalC100PranjalC100
authored
remove flags and deprecated methods 2 (#4836)
1 parent 2df3de7 commit 1ab1f07

13 files changed

Lines changed: 9 additions & 211 deletions

File tree

‎tools/integration_tests/release_version/setup_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ func TestMain(m *testing.M) {
2929
// 1. Load and parse the common configuration.
3030
cfg := test_suite.ReadConfigFile(setup.ConfigFile())
3131
if len(cfg.ReleaseVersion) == 0 {
32-
log.Println("No configuration found for release_version tests in config. Using flags instead.")
33-
cfg.ReleaseVersion = make([]test_suite.TestConfig, 1)
34-
cfg.ReleaseVersion[0].TestBucket = setup.TestBucket()
35-
cfg.ReleaseVersion[0].GKEMountedDirectory = setup.MountedDirectory()
32+
log.Fatal("No configuration found for ReleaseVersion in config file.")
3633
}
3734

3835
// 2. Not running mounted directory tests.

‎tools/integration_tests/rename_dir_limit/rename_dir_limit_test.go‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,7 @@ func TestMain(m *testing.M) {
5555
// 1. Load and parse the common configuration.
5656
cfg := test_suite.ReadConfigFile(setup.ConfigFile())
5757
if len(cfg.RenameDirLimit) == 0 {
58-
log.Println("No configuration found for rename dir limit tests in config. Using flags instead.")
59-
// Populate the config manually.
60-
cfg.RenameDirLimit = make([]test_suite.TestConfig, 1)
61-
cfg.RenameDirLimit[0].TestBucket = setup.TestBucket()
62-
cfg.RenameDirLimit[0].GKEMountedDirectory = setup.MountedDirectory()
63-
cfg.RenameDirLimit[0].Configs = make([]test_suite.ConfigItem, 2)
64-
cfg.RenameDirLimit[0].Configs[0].Flags = []string{
65-
"--rename-dir-limit=3 --implicit-dirs --client-protocol=grpc",
66-
"--rename-dir-limit=3",
67-
"--rename-dir-limit=3 --client-protocol=grpc",
68-
}
69-
cfg.RenameDirLimit[0].Configs[0].Compatible = map[string]bool{"flat": true, "hns": false, "zonal": false}
70-
cfg.RenameDirLimit[0].Configs[1].Flags = []string{
71-
"",
72-
}
73-
cfg.RenameDirLimit[0].Configs[1].Compatible = map[string]bool{"flat": false, "hns": true, "zonal": true}
58+
log.Fatal("No configuration found for RenameDirLimit in config file.")
7459
}
7560

7661
ctx = context.Background()

‎tools/integration_tests/requester_pays_bucket/setup_test.go‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,7 @@ func TestMain(m *testing.M) {
8181
// Load and parse the common configuration.
8282
cfg := test_suite.ReadConfigFile(setup.ConfigFile())
8383
if len(cfg.RequesterPaysBucket) == 0 {
84-
log.Println("No configuration found for requester pays bucket tests in config. Using flags instead.")
85-
// Populate the config manually.
86-
cfg.RequesterPaysBucket = make([]test_suite.TestConfig, 1)
87-
cfg.RequesterPaysBucket[0].TestBucket = setup.TestBucket()
88-
cfg.RequesterPaysBucket[0].GKEMountedDirectory = setup.MountedDirectory()
89-
cfg.RequesterPaysBucket[0].Configs = make([]test_suite.ConfigItem, 1)
90-
cfg.RequesterPaysBucket[0].Configs[0].Flags = []string{
91-
"--billing-project=${BILLING_PROJECT} --key-file=${KEY_FILE}",
92-
"--billing-project=${BILLING_PROJECT} --client-protocol=grpc --key-file=${KEY_FILE}",
93-
"--billing-project=${BILLING_PROJECT} --client-protocol=grpc --grpc-path-strategy=direct-path-only --key-file=${KEY_FILE}",
94-
}
95-
cfg.RequesterPaysBucket[0].Configs[0].Compatible = map[string]bool{"flat": true, "hns": true, "zonal": false}
84+
log.Fatal("No configuration found for RequesterPaysBucket in config file.")
9685
}
9786

9887
testEnv.ctx = context.Background()

‎tools/integration_tests/shared_chunk_cache/setup_test.go‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,7 @@ func TestMain(m *testing.M) {
4949
// 1. Load and parse the common configuration.
5050
cfg := test_suite.ReadConfigFile(setup.ConfigFile())
5151
if len(cfg.SharedChunkCache) == 0 {
52-
log.Println("No configuration found for shared_chunk_cache tests in config. Using flags instead.")
53-
// Populate the config manually.
54-
cfg.SharedChunkCache = make([]test_suite.TestConfig, 1)
55-
cfg.SharedChunkCache[0].TestBucket = setup.TestBucket()
56-
cfg.SharedChunkCache[0].GKEMountedDirectory = setup.MountedDirectory()
57-
cfg.SharedChunkCache[0].LogFile = setup.LogFile()
58-
cfg.SharedChunkCache[0].Configs = make([]test_suite.ConfigItem, 1)
59-
60-
// TestSharedChunkCacheTestSuite - dual mount with shared cache
61-
cfg.SharedChunkCache[0].Configs[0].Flags = []string{
62-
"--enable-experimental-shared-chunk-cache --file-cache-max-size-mb=-1 --cache-dir=/gcsfuse-tmp/shared-cache",
63-
}
64-
cfg.SharedChunkCache[0].Configs[0].SecondaryFlags = []string{
65-
"--enable-experimental-shared-chunk-cache --file-cache-max-size-mb=-1 --cache-dir=/gcsfuse-tmp/shared-cache",
66-
}
67-
cfg.SharedChunkCache[0].Configs[0].Compatible = map[string]bool{"flat": true, "hns": true, "zonal": true}
68-
cfg.SharedChunkCache[0].Configs[0].Run = "TestSharedChunkCacheTestSuite"
52+
log.Fatal("No configuration found for SharedChunkCache in config file.")
6953
}
7054

7155
testEnv.ctx = context.Background()

‎tools/integration_tests/stale_handle/setup_test.go‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -56,30 +56,7 @@ func TestMain(m *testing.M) {
5656
// 1. Load and parse the common configuration.
5757
cfg := test_suite.ReadConfigFile(setup.ConfigFile())
5858
if len(cfg.StaleHandle) == 0 {
59-
log.Println("No configuration found for stale_handle tests in config. Using flags instead.")
60-
if setup.MountedDirectory() != "" {
61-
log.Println("Skip mounted directory tests if no config file has been passed.")
62-
os.Exit(0)
63-
}
64-
// Populate the config manually.
65-
cfg.StaleHandle = make([]test_suite.TestConfig, 1)
66-
cfg.StaleHandle[0].TestBucket = setup.TestBucket()
67-
cfg.StaleHandle[0].GKEMountedDirectory = setup.MountedDirectory()
68-
cfg.StaleHandle[0].LogFile = setup.LogFile()
69-
cfg.StaleHandle[0].Configs = make([]test_suite.ConfigItem, 4)
70-
cfg.StaleHandle[0].Configs[0].Flags = []string{
71-
"--metadata-cache-ttl-secs=0 --write-block-size-mb=1 --write-max-blocks-per-file=1",
72-
"--metadata-cache-ttl-secs=0 --write-block-size-mb=1 --write-max-blocks-per-file=1 --client-protocol=grpc",
73-
}
74-
cfg.StaleHandle[0].Configs[0].Compatible = map[string]bool{"flat": true, "hns": true, "zonal": true}
75-
cfg.StaleHandle[0].Configs[0].Run = "TestStaleHandleStreamingWritesEnabled"
76-
77-
cfg.StaleHandle[0].Configs[1].Flags = []string{
78-
"--metadata-cache-ttl-secs=0 --enable-streaming-writes=false",
79-
"--metadata-cache-ttl-secs=0 --enable-streaming-writes=false --client-protocol=grpc",
80-
}
81-
cfg.StaleHandle[0].Configs[1].Compatible = map[string]bool{"flat": true, "hns": true, "zonal": true}
82-
cfg.StaleHandle[0].Configs[1].Run = "TestStaleHandleStreamingWritesDisabled"
59+
log.Fatal("No configuration found for StaleHandle in config file.")
8360
}
8461

8562
testEnv.ctx = context.Background()

‎tools/integration_tests/streaming_writes/setup_test.go‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,7 @@ func TestMain(m *testing.M) {
4646
// 1. Load and parse the common configuration.
4747
cfg := test_suite.ReadConfigFile(setup.ConfigFile())
4848
if len(cfg.StreamingWrites) == 0 {
49-
log.Println("No configuration found for streaming_writes tests in config. Using flags instead.")
50-
// Populate the config manually.
51-
cfg.StreamingWrites = make([]test_suite.TestConfig, 1)
52-
cfg.StreamingWrites[0].TestBucket = setup.TestBucket()
53-
cfg.StreamingWrites[0].GKEMountedDirectory = setup.MountedDirectory()
54-
cfg.StreamingWrites[0].LogFile = setup.LogFile()
55-
cfg.StreamingWrites[0].Configs = make([]test_suite.ConfigItem, 1)
56-
cfg.StreamingWrites[0].Configs[0].Flags = []string{
57-
"--rename-dir-limit=3 --write-block-size-mb=1 --write-max-blocks-per-file=2 --client-protocol=grpc --write-global-max-blocks=-1",
58-
"--rename-dir-limit=3 --write-block-size-mb=1 --write-max-blocks-per-file=2 --write-global-max-blocks=-1",
59-
}
60-
cfg.StreamingWrites[0].Configs[0].Compatible = map[string]bool{"flat": true, "hns": true, "zonal": true}
49+
log.Fatal("No configuration found for StreamingWrites in config file.")
6150
}
6251

6352
testEnv.ctx = context.Background()

‎tools/integration_tests/symlink_handling/symlink_handling_test.go‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,7 @@ func TestMain(m *testing.M) {
5050
// 1. Load and parse the common configuration.
5151
cfg := test_suite.ReadConfigFile(setup.ConfigFile())
5252
if len(cfg.SymlinkHandling) == 0 {
53-
log.Println("No configuration found for symlink handling tests in config. Using flags instead.")
54-
// Populate the config manually.
55-
cfg.SymlinkHandling = make([]test_suite.TestConfig, 1)
56-
cfg.SymlinkHandling[0].TestBucket = setup.TestBucket()
57-
cfg.SymlinkHandling[0].GKEMountedDirectory = setup.MountedDirectory()
58-
cfg.SymlinkHandling[0].LogFile = setup.LogFile()
59-
cfg.SymlinkHandling[0].Configs = make([]test_suite.ConfigItem, 2)
60-
61-
// 1. TestStandardSymlinksTestSuite
62-
cfg.SymlinkHandling[0].Configs[0].Flags = []string{"--enable-standard-symlinks=true"}
63-
cfg.SymlinkHandling[0].Configs[0].Compatible = map[string]bool{"flat": true, "hns": true, "zonal": true}
64-
cfg.SymlinkHandling[0].Configs[0].Run = "TestStandardSymlinksTestSuite"
65-
66-
// 2. TestLegacySymlinksTestSuite
67-
cfg.SymlinkHandling[0].Configs[1].Flags = []string{"--enable-standard-symlinks=false"}
68-
cfg.SymlinkHandling[0].Configs[1].Compatible = map[string]bool{"flat": true, "hns": true, "zonal": true}
69-
cfg.SymlinkHandling[0].Configs[1].Run = "TestLegacySymlinksTestSuite"
53+
log.Fatal("No configuration found for SymlinkHandling in config file.")
7054
}
7155

7256
testEnv.ctx = context.Background()

‎tools/integration_tests/unfinalized_object/setup_test.go‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -53,31 +53,7 @@ func TestMain(m *testing.M) {
5353
// 1. Load and parse the common configuration.
5454
cfg := test_suite.ReadConfigFile(setup.ConfigFile())
5555
if len(cfg.UnfinalizedObject) == 0 {
56-
log.Println("No configuration found for unfinalized_object tests in config. Using flags instead.")
57-
// Populate the config manually.
58-
cfg.UnfinalizedObject = make([]test_suite.TestConfig, 1)
59-
cfg.UnfinalizedObject[0].TestBucket = setup.TestBucket()
60-
cfg.UnfinalizedObject[0].GKEMountedDirectory = setup.MountedDirectory()
61-
cfg.UnfinalizedObject[0].LogFile = setup.LogFile()
62-
cfg.UnfinalizedObject[0].Configs = make([]test_suite.ConfigItem, 3)
63-
cfg.UnfinalizedObject[0].Configs[0].Flags = []string{
64-
"--metadata-cache-ttl-secs=-1",
65-
"--metadata-cache-ttl-secs=-1 --enable-kernel-reader=false",
66-
}
67-
cfg.UnfinalizedObject[0].Configs[0].Compatible = map[string]bool{"flat": false, "hns": false, "zonal": true}
68-
cfg.UnfinalizedObject[0].Configs[0].Run = "TestUnfinalizedObjectReadTest"
69-
cfg.UnfinalizedObject[0].Configs[1].Flags = []string{
70-
"--metadata-cache-ttl-secs=0",
71-
"--metadata-cache-ttl-secs=0 --enable-kernel-reader=false",
72-
}
73-
cfg.UnfinalizedObject[0].Configs[1].Compatible = map[string]bool{"flat": false, "hns": false, "zonal": true}
74-
cfg.UnfinalizedObject[0].Configs[1].Run = "TestUnfinalizedObjectOperationTest"
75-
cfg.UnfinalizedObject[0].Configs[2].Flags = []string{
76-
"--metadata-cache-ttl-secs=2",
77-
"--metadata-cache-ttl-secs=2 --enable-kernel-reader=false",
78-
}
79-
cfg.UnfinalizedObject[0].Configs[2].Compatible = map[string]bool{"flat": false, "hns": false, "zonal": true}
80-
cfg.UnfinalizedObject[0].Configs[2].Run = "TestUnfinalizedObjectTailingReadTest"
56+
log.Fatal("No configuration found for UnfinalizedObject in config file.")
8157
}
8258

8359
testEnv.ctx = context.Background()

‎tools/integration_tests/unsupported_path/setup_test.go‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,28 +40,7 @@ func TestMain(m *testing.M) {
4040
// 1. Load and parse the common configuration.
4141
cfg := test_suite.ReadConfigFile(setup.ConfigFile())
4242
if len(cfg.UnsupportedPath) == 0 {
43-
log.Println("No configuration found for unsupported path tests in config. Using flags instead.")
44-
// Populate the config manually.
45-
cfg.UnsupportedPath = []test_suite.TestConfig{
46-
{
47-
TestBucket: setup.TestBucket(),
48-
GKEMountedDirectory: setup.MountedDirectory(),
49-
Configs: []test_suite.ConfigItem{
50-
{
51-
Flags: []string{
52-
"--implicit-dirs --client-protocol=grpc --enable-unsupported-path-support=true --rename-dir-limit=200 --metadata-cache-negative-ttl-secs=0",
53-
},
54-
Compatible: map[string]bool{"flat": true, "hns": true, "zonal": false},
55-
},
56-
{
57-
Flags: []string{
58-
"--implicit-dirs --enable-unsupported-path-support=true --rename-dir-limit=200 --metadata-cache-negative-ttl-secs=0",
59-
},
60-
Compatible: map[string]bool{"flat": true, "hns": true, "zonal": true},
61-
},
62-
},
63-
},
64-
}
43+
log.Fatal("No configuration found for UnsupportedPath in config file.")
6544
}
6645

6746
ctx = context.Background()

‎tools/integration_tests/util/mounting/dynamic_mounting/dynamic_mounting.go‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@
1515
package dynamic_mounting
1616

1717
import (
18-
"context"
1918
"fmt"
2019
"log"
2120
"path"
2221
"testing"
2322

24-
"cloud.google.com/go/storage"
2523
"github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/mounting"
2624
"github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/setup"
2725
"github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/test_suite"
@@ -94,18 +92,6 @@ func executeTestsForDynamicMounting(config *test_suite.TestConfig, flagsSet [][]
9492
return
9593
}
9694

97-
// Deprecated: Use RunTestsWithConfigFile instead.
98-
// TODO(b/438068132): cleanup deprecated methods after migration is complete.
99-
func RunTests(ctx context.Context, client *storage.Client, flags [][]string, m *testing.M) (successCode int) {
100-
config := &test_suite.TestConfig{
101-
TestBucket: setup.TestBucket(),
102-
GKEMountedDirectory: setup.MountedDirectory(),
103-
GCSFuseMountedDirectory: setup.MntDir(),
104-
LogFile: setup.LogFile(),
105-
}
106-
return RunTestsWithConfigFile(config, flags, m)
107-
}
108-
10995
func RunTestsWithConfigFile(config *test_suite.TestConfig, flagsSet [][]string, m *testing.M) (successCode int) {
11096
log.Println("Running dynamic mounting tests...")
11197
log.Printf("GCSFuse Log File for test: %s\n", config.LogFile)

0 commit comments

Comments
 (0)