Skip to content

Commit da3529f

Browse files
committed
not to run on mounted dir
1 parent 650366b commit da3529f

File tree

3 files changed

+3
-26
lines changed

3 files changed

+3
-26
lines changed

tools/integration_tests/log_rotation/log_rotation_test.go

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,6 @@ var (
5151
func setupLogFilePath(testName string) {
5252
var logFilePath string
5353
logFilePath = path.Join(setup.TestDir(), GKETempDir, testName) + ".log"
54-
if cfg.GKEMountedDirectory != "" { // GKE path
55-
mountDir = cfg.GKEMountedDirectory
56-
logFilePath = path.Join(GKETempDir, testName) + ".log"
57-
if setup.ConfigFile() == "" {
58-
// TODO: clean this up when GKE test migration completes.
59-
logFilePath = path.Join(GKETempDir, testName) + ".log"
60-
}
61-
}
6254
cfg.LogFile = logFilePath
6355
}
6456

@@ -97,7 +89,8 @@ func TestMain(m *testing.M) {
9789

9890
// 3. To run mountedDirectory tests, we need both testBucket and mountedDirectory
9991
if cfg.GKEMountedDirectory != "" && cfg.TestBucket != "" {
100-
os.Exit(setup.RunTestsForMountedDirectory(cfg.GKEMountedDirectory, m))
92+
log.Println("These tests will not run with mounted directory..")
93+
return
10194
}
10295

10396
// 4. Build the flag sets dynamically from the config.

tools/integration_tests/run_tests_mounted_directory.sh

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -317,22 +317,6 @@ gcsfuse --implicit-dirs=false --rename-dir-limit=3 --enable-streaming-writes=fal
317317
GODEBUG=asyncpreemptoff=1 go test ./tools/integration_tests/local_file/... -p 1 --integrationTest -v --mountedDirectory=$MOUNT_DIR --testbucket=$TEST_BUCKET_NAME ${ZONAL_BUCKET_ARG}
318318
sudo umount $MOUNT_DIR
319319

320-
# Run tests with log rotation config.
321-
rm -r /tmp/gcsfuse_integration_test_logs
322-
mkdir /tmp/gcsfuse_integration_test_logs
323-
echo "logging:
324-
file-path: /tmp/gcsfuse_integration_test_logs/log.txt
325-
format: text
326-
severity: trace
327-
log-rotate:
328-
max-file-size-mb: 2
329-
backup-file-count: 3
330-
compress: true
331-
" > /tmp/gcsfuse_config.yaml
332-
gcsfuse --config-file=/tmp/gcsfuse_config.yaml $TEST_BUCKET_NAME $MOUNT_DIR
333-
GODEBUG=asyncpreemptoff=1 go test ./tools/integration_tests/log_rotation/... -p 1 --integrationTest -v --mountedDirectory=$MOUNT_DIR ${ZONAL_BUCKET_ARG}
334-
sudo umount $MOUNT_DIR
335-
336320
# Run read cache functional tests.
337321
function read_cache_test_setup() {
338322
local cache_size_mb=$1

tools/integration_tests/test_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,4 +532,4 @@ log_rotation:
532532
flat: true
533533
hns: true
534534
zonal: true
535-
run_on_gke: true
535+
run_on_gke: false

0 commit comments

Comments
 (0)