From 143700aaa06eccfffa9b0e4012c54643ace1c537 Mon Sep 17 00:00:00 2001 From: Ayush Sethi Date: Mon, 24 Jun 2024 07:54:58 +0000 Subject: [PATCH] adding back tests --- .../read_cache/cache_file_for_range_read_false_test.go | 3 ++- .../read_cache/cache_file_for_range_read_true_test.go | 1 - tools/integration_tests/read_cache/disabled_cache_ttl_test.go | 1 - tools/integration_tests/read_cache/local_modification_test.go | 3 ++- tools/integration_tests/read_cache/range_read_test.go | 3 ++- tools/integration_tests/read_cache/read_only_test.go | 3 ++- tools/integration_tests/read_cache/remount_test.go | 3 ++- tools/integration_tests/read_cache/setup_test.go | 4 ++-- tools/integration_tests/read_cache/small_cache_ttl_test.go | 3 ++- 9 files changed, 14 insertions(+), 10 deletions(-) diff --git a/tools/integration_tests/read_cache/cache_file_for_range_read_false_test.go b/tools/integration_tests/read_cache/cache_file_for_range_read_false_test.go index a54493e225..1420373c43 100644 --- a/tools/integration_tests/read_cache/cache_file_for_range_read_false_test.go +++ b/tools/integration_tests/read_cache/cache_file_for_range_read_false_test.go @@ -139,10 +139,11 @@ func TestCacheFileForRangeReadFalseTest(t *testing.T) { // Define flag set to run the tests. flagsSet := [][]string{ {"--implicit-dirs=true"}, - {"--implicit-dirs=false"}, } setup.AppendFlagsToAllFlagsInTheFlagsSet(&flagsSet, "--config-file="+createConfigFile(cacheCapacityForRangeReadTestInMiB, false, configFileName, false)) + flagsSet = append(flagsSet, []string{"--implicit-dirs", "--config-file=" + createConfigFile(cacheCapacityForRangeReadTestInMiB, + false, configFileName, true)}) // Run tests. for _, flags := range flagsSet { diff --git a/tools/integration_tests/read_cache/cache_file_for_range_read_true_test.go b/tools/integration_tests/read_cache/cache_file_for_range_read_true_test.go index e2b6c10f2f..fe4136d2fd 100644 --- a/tools/integration_tests/read_cache/cache_file_for_range_read_true_test.go +++ b/tools/integration_tests/read_cache/cache_file_for_range_read_true_test.go @@ -96,7 +96,6 @@ func TestCacheFileForRangeReadTrueTest(t *testing.T) { // Define flag set to run the tests. flagsSet := [][]string{ {"--implicit-dirs=true"}, - {"--implicit-dirs=false"}, } setup.AppendFlagsToAllFlagsInTheFlagsSet(&flagsSet, "--config-file="+createConfigFile(cacheCapacityForRangeReadTestInMiB, true, configFileName, false)) diff --git a/tools/integration_tests/read_cache/disabled_cache_ttl_test.go b/tools/integration_tests/read_cache/disabled_cache_ttl_test.go index 5712da1cd1..6a1342171a 100644 --- a/tools/integration_tests/read_cache/disabled_cache_ttl_test.go +++ b/tools/integration_tests/read_cache/disabled_cache_ttl_test.go @@ -97,7 +97,6 @@ func TestDisabledCacheTTLTest(t *testing.T) { // Define flag set to run the tests. flagsSet := [][]string{ {"--implicit-dirs=true"}, - {"--implicit-dirs=false"}, } setup.AppendFlagsToAllFlagsInTheFlagsSet(&flagsSet, "--config-file="+createConfigFile(cacheCapacityInMB, false, configFileName, false)) diff --git a/tools/integration_tests/read_cache/local_modification_test.go b/tools/integration_tests/read_cache/local_modification_test.go index 1250d031aa..ce72ad9fc0 100644 --- a/tools/integration_tests/read_cache/local_modification_test.go +++ b/tools/integration_tests/read_cache/local_modification_test.go @@ -101,10 +101,11 @@ func TestLocalModificationTest(t *testing.T) { // Define flag set to run the tests. flagsSet := [][]string{ {"--implicit-dirs=true"}, - {"--implicit-dirs=false"}, } setup.AppendFlagsToAllFlagsInTheFlagsSet(&flagsSet, "--config-file="+createConfigFile(cacheCapacityInMB, false, configFileName, false)) + flagsSet = append(flagsSet, []string{"--implicit-dirs", "--config-file=" + createConfigFile(cacheCapacityInMB, + false, configFileName, true)}) // Run tests. for _, flags := range flagsSet { diff --git a/tools/integration_tests/read_cache/range_read_test.go b/tools/integration_tests/read_cache/range_read_test.go index 37cced6b4e..73a640e1aa 100644 --- a/tools/integration_tests/read_cache/range_read_test.go +++ b/tools/integration_tests/read_cache/range_read_test.go @@ -103,11 +103,12 @@ func TestRangeReadTest(t *testing.T) { // Define flag set to run the tests. flagSet := [][]string{ {"--implicit-dirs=true"}, - {"--implicit-dirs=false"}, } setup.AppendFlagsToAllFlagsInTheFlagsSet(&flagSet, "--config-file="+createConfigFile(cacheCapacityForVeryLargeFileInMiB, false, configFileName+"1", false), "--config-file="+createConfigFile(cacheCapacityForVeryLargeFileInMiB, true, configFileName+"2", false)) + flagSet = append(flagSet, []string{"--implicit-dirs", "--config-file=" + createConfigFile(cacheCapacityForVeryLargeFileInMiB, + false, configFileName+"3", true)}) // Run tests. for _, flags := range flagSet { diff --git a/tools/integration_tests/read_cache/read_only_test.go b/tools/integration_tests/read_cache/read_only_test.go index 6a2fdc820c..5ec8d56007 100644 --- a/tools/integration_tests/read_cache/read_only_test.go +++ b/tools/integration_tests/read_cache/read_only_test.go @@ -166,12 +166,13 @@ func TestReadOnlyTest(t *testing.T) { // Define flag set to run the tests. flagsSet := [][]string{ {"--implicit-dirs=true"}, - {"--implicit-dirs=false"}, } setup.AppendFlagsToAllFlagsInTheFlagsSet(&flagsSet, "--config-file="+createConfigFile(cacheCapacityInMB, false, configFileName+"1", false), "--config-file="+createConfigFile(cacheCapacityInMB, true, configFileName+"2", false)) setup.AppendFlagsToAllFlagsInTheFlagsSet(&flagsSet, "--o=ro", "") + flagsSet = append(flagsSet, []string{"--implicit-dirs", "--o=ro", "--config-file=" + createConfigFile(cacheCapacityInMB, + false, configFileName+"3", true)}) // Run tests. for _, flags := range flagsSet { diff --git a/tools/integration_tests/read_cache/remount_test.go b/tools/integration_tests/read_cache/remount_test.go index 1c5ba27a03..dd98b7cd64 100644 --- a/tools/integration_tests/read_cache/remount_test.go +++ b/tools/integration_tests/read_cache/remount_test.go @@ -133,10 +133,11 @@ func TestRemountTest(t *testing.T) { // Define flag set to run the tests. flagsSet := [][]string{ {"--implicit-dirs=true"}, - {"--implicit-dirs=false"}, } setup.AppendFlagsToAllFlagsInTheFlagsSet(&flagsSet, "--config-file="+createConfigFile(cacheCapacityInMB, false, configFileName, false)) setup.AppendFlagsToAllFlagsInTheFlagsSet(&flagsSet, "--o=ro", "") + flagsSet = append(flagsSet, []string{"--implicit-dirs", "--config-file=" + createConfigFile(cacheCapacityInMB, + false, configFileName, true)}) // Create storage client before running tests. ts := &remountTest{ctx: context.Background()} diff --git a/tools/integration_tests/read_cache/setup_test.go b/tools/integration_tests/read_cache/setup_test.go index 98f550e81c..12c57093d3 100644 --- a/tools/integration_tests/read_cache/setup_test.go +++ b/tools/integration_tests/read_cache/setup_test.go @@ -65,9 +65,9 @@ const ( offsetEndOfFile = veryLargeFileSize - 1*util.MiB cacheDirName = "cache-dir" logFileNameForMountedDirectoryTests = "/tmp/gcsfuse_read_cache_test_logs/log.json" - downloadParallelismPerFile = 5 + downloadParallelismPerFile = 4 maxDownloadParallelism = -1 - readRequestSizeMB = 4 + readRequestSizeMB = 2 enableCrcCheck = true ) diff --git a/tools/integration_tests/read_cache/small_cache_ttl_test.go b/tools/integration_tests/read_cache/small_cache_ttl_test.go index 1a504315b0..90d47d79be 100644 --- a/tools/integration_tests/read_cache/small_cache_ttl_test.go +++ b/tools/integration_tests/read_cache/small_cache_ttl_test.go @@ -122,12 +122,13 @@ func TestSmallCacheTTLTest(t *testing.T) { // Define flag set to run the tests. flagsSet := [][]string{ {"--implicit-dirs=true"}, - {"--implicit-dirs=false"}, } setup.AppendFlagsToAllFlagsInTheFlagsSet(&flagsSet, "--config-file="+createConfigFile(cacheCapacityInMB, false, configFileName, false)) setup.AppendFlagsToAllFlagsInTheFlagsSet(&flagsSet, fmt.Sprintf("--stat-cache-ttl=%ds", metadataCacheTTlInSec)) setup.AppendFlagsToAllFlagsInTheFlagsSet(&flagsSet, "--o=ro", "") + flagsSet = append(flagsSet, []string{fmt.Sprintf("--stat-cache-ttl=%ds", metadataCacheTTlInSec), "--config-file=" + createConfigFile(cacheCapacityInMB, + false, configFileName+"3", true)}) // Run tests. for _, flags := range flagsSet {