Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kokoro perf test fix - Integration tests #1239

Merged
merged 12 commits into from
Jul 22, 2023
Merged

Kokoro perf test fix - Integration tests #1239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fe3f1a6
testing
Tulsishah Jul 21, 2023
175adf2
testing
Tulsishah Jul 21, 2023
a284648
testing
Tulsishah Jul 21, 2023
99f046a
adding comment for a reason
Tulsishah Jul 21, 2023
8463a63
creating function to copy dir with root permission
Tulsishah Jul 21, 2023
c1e91fc
common function
Tulsishah Jul 21, 2023
f04782b
fix
Tulsishah Jul 21, 2023
a397067
testing
Tulsishah Jul 21, 2023
ffb3aa2
revert changes
Tulsishah Jul 21, 2023
a60dd12
revert changes
Tulsishah Jul 21, 2023
389b47a
adding remove package
Tulsishah Jul 21, 2023
3483278
adding remove package
Tulsishah Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tools/integration_tests/list_large_dir/list_large_dir_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,7 @@ func TestMain(m *testing.M) {

successCode := static_mounting.RunTests(flags, m)

setup.RemoveBinFileCopiedForTesting()

os.Exit(successCode)
}
2 changes: 2 additions & 0 deletions tools/integration_tests/operations/operations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,7 @@ func TestMain(m *testing.M) {
successCode = creds_tests.RunTestsForKeyFileAndGoogleApplicationCredentialsEnvVarSet(flags, "objectAdmin", m)
}

setup.RemoveBinFileCopiedForTesting()

os.Exit(successCode)
}
2 changes: 2 additions & 0 deletions tools/integration_tests/readonly/readonly_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,7 @@ func TestMain(m *testing.M) {
// Delete objects from bucket after testing.
setup.RunScriptForTestData("testdata/delete_objects.sh", setup.TestBucket())

setup.RemoveBinFileCopiedForTesting()

os.Exit(successCode)
}
2 changes: 2 additions & 0 deletions tools/integration_tests/rename_dir_limit/rename_dir_limit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,7 @@ func TestMain(m *testing.M) {
successCode = persistent_mounting.RunTests(flags, m)
}

setup.RemoveBinFileCopiedForTesting()

os.Exit(successCode)
}
20 changes: 17 additions & 3 deletions tools/integration_tests/util/operations/dir_operations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,30 @@ import (
const FilePermission_0600 = 0600
const FilePermission_0777 = 0777

func CopyDir(srcDirPath string, destDirPath string) (err error) {
cmd := exec.Command("cp", "--recursive", srcDirPath, destDirPath)

func executeCommandForCopyOperation(cmd *exec.Cmd) (err error) {
err = cmd.Run()
if err != nil {
err = fmt.Errorf("Copying dir operation is failed: %v", err)
}
return
}

func CopyDir(srcDirPath string, destDirPath string) (err error) {
cmd := exec.Command("cp", "--recursive", srcDirPath, destDirPath)

err = executeCommandForCopyOperation(cmd)

return
}

func CopyDirWithRootPermission(srcDirPath string, destDirPath string) (err error) {
cmd := exec.Command("sudo", "cp", "--recursive", srcDirPath, destDirPath)

err = executeCommandForCopyOperation(cmd)

return
}

func MoveDir(srcDirPath string, destDirPath string) (err error) {
cmd := exec.Command("mv", srcDirPath, destDirPath)

Expand Down
2 changes: 2 additions & 0 deletions ...ation_tests/util/setup/implicit_and_explicit_dir_setup/implicit_and_explicit_dir_setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ func RunTestsForImplicitDirAndExplicitDir(flags [][]string, m *testing.M) {
successCode = persistent_mounting.RunTests(flags, m)
}

setup.RemoveBinFileCopiedForTesting()

os.Exit(successCode)
}

Expand Down
19 changes: 19 additions & 0 deletions tools/integration_tests/util/setup/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,14 @@ func SetUpTestDir() error {
}
binFile = path.Join(TestDir(), "bin/gcsfuse")
sbinFile = path.Join(TestDir(), "sbin/mount.gcsfuse")

// mount.gcsfuse will find gcsfuse executable in mentioned locations.
// https://github.com/GoogleCloudPlatform/gcsfuse/blob/master/tools/mount_gcsfuse/find.go#L59
// Copying the executable to /usr/local/bin
err := operations.CopyDirWithRootPermission(binFile, "/usr/local/bin")
Tulsishah marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
log.Printf("Error in copying bin file:%v", err)
}
} else {
// when testInstalledPackage flag is set, gcsfuse is preinstalled on the
// machine. Hence, here we are overwriting binFile to gcsfuse.
Expand All @@ -164,6 +172,17 @@ func SetUpTestDir() error {
return nil
}

// Removing bin file after testing.
func RemoveBinFileCopiedForTesting() {
Tulsishah marked this conversation as resolved.
Show resolved Hide resolved
if !TestInstalledPackage() {
cmd := exec.Command("sudo", "rm", "/usr/local/bin/gcsfuse")
err := cmd.Run()
if err != nil {
log.Printf("Error in removing file:%v", err)
}
}
}

func UnMount() error {
fusermount, err := exec.LookPath("fusermount")
if err != nil {
Expand Down