fix tests

Signed-off-by: Pravin Pushkar <[email protected]>

Author: pravinpushkar

tests/e2e/standalone/commands.go

@@ -122,14 +122,14 @@ func cmdStop(appId string, args ...string) (string, error) {
 func cmdUninstallAll(args ...string) (string, error) {
 	uninstallArgs := []string{"uninstall", "--all"}
 	uninstallArgs = append(uninstallArgs, args...)
-	return uninstallDapr(uninstallArgs)
+	return uninstallDapr(uninstallArgs...)
 }
 
 // cmdUninstall uninstalls Dapr without --all flag and returns the command output and error.
 func cmdUninstall(args ...string) (string, error) {
 	uninstallArgs := []string{"uninstall"}
 	uninstallArgs = append(uninstallArgs, args...)
-	return uninstallDapr(uninstallArgs)
+	return uninstallDapr(uninstallArgs...)
 }
 
 // cmdVersion checks the version of Dapr and returns the command output and error.

tests/e2e/standalone/upgrade_test.go

@@ -19,6 +19,7 @@ limitations under the License.
 package standalone_test
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
@@ -65,11 +66,11 @@ func TestResourcesLoadPrecedence(t *testing.T) {
 
 		// dapr run with both flags --resources-path and --components-path.
 		args := []string{
-			"--components-path", defaultComponentsDirPath, 
-			"--resources-path", defaultResourcesDirPath
+			"--components-path", defaultComponentsDirPath,
+			"--resources-path", defaultResourcesDirPath,
 		}
 		testDaprRunOutput(t, true, args...)
-	}
+	})
 
 	t.Run("with pre-existing components directory", func(t *testing.T) {
 		// Ensure a clean environment.
@@ -87,7 +88,7 @@ func TestResourcesLoadPrecedence(t *testing.T) {
 		// uninstall without removing the components directory.
 		must(t, cmdUninstall, "failed to uninstall Dapr")
 
-		// install dapr -> installs dapr. It does following - 
+		// install dapr -> installs dapr. It does following -
 		// 1) creates resources directory. 2)copy resources from components to resources directory.
 		// 3) delete components directory. 4) creates symlink components for resources directory.
 		ensureDaprInstallation(t)
@@ -100,7 +101,7 @@ func TestResourcesLoadPrecedence(t *testing.T) {
 
 		// dapr run with --resources-path flag -> should also load the in-memory component.
 		testDaprRunOutput(t, true, "--resources-path", defaultResourcesDirPath)
-	}
+	})
 
 	t.Run("add resources to components directory post dapr install", func(t *testing.T) {
 		// Ensure a clean environment.
@@ -123,7 +124,7 @@ func TestResourcesLoadPrecedence(t *testing.T) {
 
 		// dapr run with --resources-path flag -> should also load the in-memory component.
 		testDaprRunOutput(t, true, "--resources-path", defaultResourcesDirPath)
-	}
+	})
 }
 
 func prepareComponentsDir(t *testing.T) {

tests/e2e/standalone/utils.go

@@ -127,23 +127,27 @@ func executeAgainstRunningDapr(t *testing.T, f func(), daprArgs ...string) {
 // ensureDaprInstallation ensures that Dapr is installed.
 // If Dapr is not installed, a new installation is attempted.
 func ensureDaprInstallation(t *testing.T) {
-	daprRuntimeVersion, _ := common.GetVersionsFromEnv(t, false)
 	homeDir, err := os.UserHomeDir()
 	require.NoError(t, err, "failed to get user home directory")
 
 	daprPath := filepath.Join(homeDir, ".dapr")
-	_, err = os.Stat(daprPath)
-	if os.IsNotExist(err) {
-		args := []string{
-			"--runtime-version", daprRuntimeVersion,
+	if _, err = os.Stat(daprPath); err != nil {
+		if os.IsNotExist(err) {
+			installDapr(t)
+		} else {
+			// Some other error occurred.
+			require.NoError(t, err, "failed to stat dapr installation")
+		}
+	}
+	daprBinPath := filepath.Join(daprPath, "bin")
+	if _, err = os.Stat(daprBinPath); err != nil {
+		if os.IsNotExist(err) {
+			installDapr(t)
+		} else {
+			// Some other error occurred.
+			require.NoError(t, err, "failed to stat dapr installation")
 		}
-		_, err = cmdInit(args...)
-		require.NoError(t, err, "failed to install dapr")
-	} else if err != nil {
-		// Some other error occurred.
-		require.NoError(t, err, "failed to stat dapr installation")
 	}
-
 	// Slim mode does not have any resources by default.
 	// Install the resources required by the tests.
 	if isSlimMode() {
@@ -159,6 +163,15 @@ func containerRuntime() string {
 	return ""
 }
 
+func installDapr(t *testing.T) {
+	daprRuntimeVersion, _ := common.GetVersionsFromEnv(t, false)
+	args := []string{
+		"--runtime-version", daprRuntimeVersion,
+	}
+	_, err := cmdInit(args...)
+	require.NoError(t, err, "failed to install dapr")
+}
+
 func uninstallDapr(uninstallArgs ...string) (string, error) {
 	daprContainerRuntime := containerRuntime()