updated flag to assume preinstalled package

tools/integration_tests/mounting/gcsfuse_test.go

@@ -58,7 +58,7 @@ func init() { RegisterTestSuite(&GcsfuseTest{}) }
 func (t *GcsfuseTest) SetUp(_ *TestInfo) {
 	var err error
 	t.gcsfusePath = path.Join(gBuildDir, "bin/gcsfuse")
-	if *setup.TestPackagePath != "" {
+	if *setup.TestInstalledPackage {
 		t.gcsfusePath = "gcsfuse"
 	}
 	// Set up the temporary directory.

tools/integration_tests/mounting/main_test.go

@@ -55,18 +55,12 @@ func TestMain(m *testing.M) {
 	}
 
 	// Build into that directory.
-	if *setup.TestPackagePath == "" {
+	if !*setup.TestInstalledPackage {
 		err = util.BuildGcsfuse(gBuildDir)
 		if err != nil {
 			log.Fatalf("buildGcsfuse: %p", err)
 			return
 		}
-	} else {
-		err = setup.SetUpTestPackage(gBuildDir)
-		if err != nil {
-			log.Fatalf("SetUpTestPackage():%p", err)
-			return
-		}
 	}
 
 	// Run tests.

tools/integration_tests/mounting/mount_helper_test.go

@@ -57,13 +57,13 @@ func (t *MountHelperTest) SetUp(_ *TestInfo) {
 	switch runtime.GOOS {
 	case "darwin":
 		t.helperPath = path.Join(gBuildDir, "sbin/mount_gcsfuse")
-		if *setup.TestPackagePath != "" {
+		if *setup.TestInstalledPackage {
 			t.helperPath = "/sbin/mount_gcsfuse"
 		}
 
 	case "linux":
 		t.helperPath = path.Join(gBuildDir, "sbin/mount.gcsfuse")
-		if *setup.TestPackagePath != "" {
+		if *setup.TestInstalledPackage {
 			t.helperPath = "/sbin/mount.gcsfuse"
 		}
 
@@ -258,7 +258,7 @@ func (t *MountHelperTest) FuseSubtype() {
 
 	// Mount using the tool that would be invoked by ~mount -t fuse.gcsfuse`.
 	t.helperPath = path.Join(gBuildDir, "sbin/mount.fuse.gcsfuse")
-	if *setup.TestPackagePath != "" {
+	if *setup.TestInstalledPackage {
 		t.helperPath = "/sbin/mount.fuse.gcsfuse"
 	}
 	args := []string{canned.FakeBucketName, t.dir}

tools/integration_tests/util/mounting/mounting.go

@@ -29,7 +29,10 @@ func MountGcsfuse(flags []string) error {
 		flags...,
 	)
 
-	if *setup.TestPackagePath != "" {
+	// If TestInstalledPackage flag is set, it is assumed that gcsfuse is
+	// preinstalled on the machine. Hence, here we are overwriting the mount
+	// command to use gcsfuse instead os using tempDir/bin/gcsfuse.
+	if *setup.TestInstalledPackage {
 		mountCmd = exec.Command(
 			"gcsfuse",
 			flags...,

tools/integration_tests/util/setup/setup.go

@@ -31,7 +31,7 @@ import (
 var testBucket = flag.String("testbucket", "", "The GCS bucket used for the test.")
 var mountedDirectory = flag.String("mountedDirectory", "", "The GCSFuse mounted directory used for the test.")
 var integrationTest = flag.Bool("integrationTest", false, "Run tests only when the flag value is true.")
-var TestPackagePath = flag.String("testPackagePath", "", "[Optional] Run test on the package pointed by the path value provided on this flag. By default, integration tests builds a new package to run the tests.")
+var TestInstalledPackage = flag.Bool("testInstalledPackage", false, "[Optional] Run tests on the package pre-installed on the host machine. By default, integration tests build a new package to run the tests.")
 
 const BufferSize = 100
 const FilePermission_0600 = 0600
@@ -122,75 +122,20 @@ func CreateTempFile() string {
 	return fileName
 }
 
-func setUpDebPackage() error {
-	cmd := exec.Command("sudo", "apt", "install", *TestPackagePath)
-	err := cmd.Run()
-	if err != nil {
-		return fmt.Errorf("failed to install debian pkg, err: %w", err)
-	}
-	return nil
-}
-
-func setUpRpmPackage() error {
-	cmd := exec.Command("sudo", "rpm", "-i", *TestPackagePath)
-	err := cmd.Run()
-	if err != nil {
-		return fmt.Errorf("failed to install rpm pkg, err: %w", err)
-	}
-	return nil
-}
-
-func SetUpTestPackage(destDir string) error {
-	_, err := os.Stat(*TestPackagePath)
-	if err != nil {
-		return fmt.Errorf("invalid TestPackagePath %s : err: %w", *TestPackagePath, err)
-	}
-
-	rpmPkgFound := false
-	debPkgFound := false
-	testPkg := *TestPackagePath
-	ext := testPkg[len(testPkg)-3:]
-	if ext == "rpm" {
-		rpmPkgFound = true
-	} else if ext == "deb" {
-		debPkgFound = true
-	}
-	if !rpmPkgFound && !debPkgFound {
-		return fmt.Errorf("%s path doesn't point to rpm or deb package: err: %w", *TestPackagePath, err)
-	}
-
-	cmd := exec.Command("cp", *TestPackagePath, destDir)
-	err = cmd.Run()
-	if err != nil {
-		return fmt.Errorf("failed to copy package from %s: err: %w", *TestPackagePath, err)
-	}
-
-	if debPkgFound {
-		return setUpDebPackage()
-	} else {
-		return setUpRpmPackage()
-	}
-}
-
 func SetUpTestDir() error {
 	var err error
 	testDir, err = os.MkdirTemp("", "gcsfuse_readwrite_test_")
 	if err != nil {
 		return fmt.Errorf("TempDir: %w\n", err)
 	}
 
-	if *TestPackagePath == "" {
+	if !*TestInstalledPackage {
 		err = util.BuildGcsfuse(testDir)
 		if err != nil {
 			return fmt.Errorf("BuildGcsfuse(%q): %w\n", TestDir(), err)
 		}
-	} else {
-		err = SetUpTestPackage(TestDir())
-		if err != nil {
-			return fmt.Errorf("SetUpTestPackage():%w\n", err)
-		}
+		binFile = path.Join(TestDir(), "bin/gcsfuse")
 	}
-	binFile = path.Join(TestDir(), "bin/gcsfuse")
 	logFile = path.Join(TestDir(), "gcsfuse.log")
 	mntDir = path.Join(TestDir(), "mnt")