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

Jump to bottom

Fixing integration tests #1157

Merged
merged 19 commits into from
Jun 5, 2023
Merged

Fixing integration tests #1157

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
33ff441
updating go version
Tulsishah May 24, 2023
1e4759f
empty commit
Tulsishah May 24, 2023
3c5a7cb
Merge branch 'GoogleCloudPlatform:master' into master
Tulsishah May 26, 2023
77e1dbb
Merge branch 'GoogleCloudPlatform:master' into master
Tulsishah May 31, 2023
10f7f5a
testing
Tulsishah May 31, 2023
28bfa7f
testing
Tulsishah May 31, 2023
16e3089
testing
Tulsishah May 31, 2023
b51bdc3
testing
Tulsishah May 31, 2023
a95d49e
testing
Tulsishah May 31, 2023
e401630
testing
Tulsishah May 31, 2023
cb6e322
back to master
Tulsishah May 31, 2023
26dd252
empty commit
Tulsishah May 31, 2023
a19efb5
empty commit
Tulsishah May 31, 2023
1fb2746
revert changes
Tulsishah May 31, 2023
787afa5
Merge branch 'GoogleCloudPlatform:master' into master
Tulsishah Jun 1, 2023
3cc5e32
small_fix_integration_test
Tulsishah Jun 1, 2023
ef804e3
small_fix_integration_test
Tulsishah Jun 1, 2023
b0058fb
Delete run_load_test_on_presubmit.sh
Tulsishah Jun 2, 2023
18a750c
add deleted file
Tulsishah Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion perfmetrics/scripts/continuous_test/gcp_ubuntu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ commitId=$(git log --before='yesterday 23:59:59' --max-count=1 --pretty=%H)
git checkout $commitId

echo "Executing integration tests"
GODEBUG=asyncpreemptoff=1 go test ./tools/integration_tests/... -p 1 --integrationTest -v --testbucket=gcsfuse-integration-test -timeout=60m
GODEBUG=asyncpreemptoff=1 go test ./tools/integration_tests/... -p 1 --integrationTest -v --testbucket=gcsfuse-integration-test

# Checkout back to master branch to use latest CI test scripts in master.
git checkout master
Expand Down
Empty file modified perfmetrics/scripts/presubmit/run_load_test_on_presubmit.sh
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion perfmetrics/scripts/presubmit_test/pr_perf_test/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ echo checkout PR branch
git checkout pr/$KOKORO_GITHUB_PULL_REQUEST_NUMBER

# Executing integration tests
GODEBUG=asyncpreemptoff=1 go test ./tools/integration_tests/... -p 1 --integrationTest -v --testbucket=gcsfuse-integration-test -timeout=60m
GODEBUG=asyncpreemptoff=1 go test ./tools/integration_tests/... -p 1 --integrationTest -v --testbucket=gcsfuse-integration-test

# Executing perf tests
echo Mounting gcs bucket from pr branch
Expand Down
4 changes: 3 additions & 1 deletion tools/integration_tests/operations/operations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,16 @@ func TestMain(m *testing.M) {
setup.ExitWithFailureIfBothTestBucketAndMountedDirectoryFlagsAreNotSet()

if setup.TestBucket() != "" && setup.MountedDirectory() != "" {
log.Printf("Both --testbucket and --mountedDirectory can't be specified at the same time.")
log.Print("Both --testbucket and --mountedDirectory can't be specified at the same time.")
os.Exit(1)
}

// Run tests for mountedDirectory only if --mountedDirectory flag is set.
setup.RunTestsForMountedDirectoryFlag(m)

// Run tests for testBucket
setup.SetUpTestDirForTestBucketFlag()
Tulsishah marked this conversation as resolved.
Show resolved Hide resolved

successCode := static_mounting.RunTests(flags, m)

if successCode == 0 {
Expand Down
5 changes: 3 additions & 2 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 @@ -61,11 +61,10 @@ func TestMain(m *testing.M) {
setup.ExitWithFailureIfBothTestBucketAndMountedDirectoryFlagsAreNotSet()

if setup.TestBucket() == "" && setup.MountedDirectory() != "" {
log.Printf("Please pass the name of bucket mounted at mountedDirectory to --testBucket flag.")
log.Print("Please pass the name of bucket mounted at mountedDirectory to --testBucket flag.")
os.Exit(1)
}

// Run tests for testBucket
// Clean the bucket for readonly testing.
setup.RunScriptForTestData("testdata/delete_objects.sh", setup.TestBucket())

Expand All @@ -75,6 +74,8 @@ func TestMain(m *testing.M) {
// Run tests for mountedDirectory only if --mountedDirectory flag is set.
setup.RunTestsForMountedDirectoryFlag(m)

// Run tests for testBucket
setup.SetUpTestDirForTestBucketFlag()
successCode := static_mounting.RunTests(flags, m)

// Delete objects from bucket after testing.
Expand Down
4 changes: 3 additions & 1 deletion 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 @@ -42,14 +42,16 @@ func TestMain(m *testing.M) {
setup.ExitWithFailureIfBothTestBucketAndMountedDirectoryFlagsAreNotSet()

if setup.TestBucket() != "" && setup.MountedDirectory() != "" {
log.Printf("Both --testbucket and --mountedDirectory can't be specified at the same time.")
log.Print("Both --testbucket and --mountedDirectory can't be specified at the same time.")
os.Exit(1)
}

// Run tests for mountedDirectory only if --mountedDirectory flag is set.
setup.RunTestsForMountedDirectoryFlag(m)

// Run tests for testBucket
setup.SetUpTestDirForTestBucketFlag()

successCode := static_mounting.RunTests(flags, m)

if successCode == 0 {
Expand Down
2 changes: 0 additions & 2 deletions tools/integration_tests/util/mounting/only_dir_mounting/only_dir_mounting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ func mountGcsFuseForFlagsAndExecuteTests(flags [][]string, dir string, m *testin
}

func executeTestsForOnlyDirMounting(flags [][]string, m *testing.M) (successCode int) {
setup.SetUpTestDirForTestBucketFlag()

mountDirInBucket := path.Join(setup.TestBucket(), DirectoryInTestBucket)
// Clean the bucket.

Expand Down
2 changes: 0 additions & 2 deletions tools/integration_tests/util/mounting/static_mounting/static_mounting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ func mountGcsfuseWithStaticMounting(flags []string) (err error) {
func executeTestsForStatingMounting(flags [][]string, m *testing.M) (successCode int) {
var err error

setup.SetUpTestDirForTestBucketFlag()

for i := 0; i < len(flags); i++ {
if err = mountGcsfuseWithStaticMounting(flags[i]); err != nil {
setup.LogAndExit(fmt.Sprintf("mountGcsfuse: %v\n", err))
Expand Down
4 changes: 2 additions & 2 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 @@ -200,7 +200,7 @@ func ParseSetUpFlags() {
flag.Parse()

if !*integrationTest {
log.Printf("Pass --integrationTest flag to run the tests.")
log.Print("Pass --integrationTest flag to run the tests.")
os.Exit(0)
}
}
Expand All @@ -209,7 +209,7 @@ func ExitWithFailureIfBothTestBucketAndMountedDirectoryFlagsAreNotSet() {
ParseSetUpFlags()

if *testBucket == "" && *mountedDirectory == "" {
log.Printf("--testbucket or --mountedDirectory must be specified")
log.Print("--testbucket or --mountedDirectory must be specified")
os.Exit(1)
}
}
Expand Down