GetTempDir -> NewTestCaseDir

client/keys/add_test.go

@@ -28,8 +28,7 @@ func Test_runAddCmdBasic(t *testing.T) {
 	assert.EqualError(t, err, "EOF")
 
 	// Prepare a keybase
-	kbHome, kbCleanUp, err := tests.GetTempDir("Test_runDeleteCmd")
-	assert.NoError(t, err)
+	kbHome, kbCleanUp := tests.NewTestCaseDir(t)
 	assert.NotNil(t, kbHome)
 	defer kbCleanUp()
 	viper.Set(cli.HomeFlag, kbHome)

client/keys/delete_test.go

@@ -26,8 +26,7 @@ func Test_runDeleteCmd(t *testing.T) {
 	fakeKeyName2 := "runDeleteCmd_Key2"
 
 	// Now add a temporary keybase
-	kbHome, cleanUp, err := tests.GetTempDir("Test_runDeleteCmd")
-	assert.NoError(t, err)
+	kbHome, cleanUp := tests.NewTestCaseDir(t)
 	defer cleanUp()
 	viper.Set(cli.HomeFlag, kbHome)
 

client/keys/list_test.go

@@ -21,15 +21,13 @@ func Test_runListCmd(t *testing.T) {
 	cmdBasic := listKeysCmd()
 
 	// Prepare some keybases
-	kbHome1, cleanUp1, err := tests.GetTempDir("Test_runListCmd")
+	kbHome1, cleanUp1 := tests.NewTestCaseDir(t)
 	defer cleanUp1()
-	assert.NoError(t, err)
 	// Do nothing, leave home1 empty
 
-	kbHome2, cleanUp2, err := tests.GetTempDir("Test_runListCmd")
+	kbHome2, cleanUp2 := tests.NewTestCaseDir(t)
 	defer cleanUp2()
 	viper.Set(cli.HomeFlag, kbHome2)
-	assert.NoError(t, err)
 
 	kb, err := NewKeyBaseFromHomeFlag()
 	assert.NoError(t, err)

client/keys/show_test.go

@@ -46,8 +46,7 @@ func Test_runShowCmd(t *testing.T) {
 
 	// Prepare a key base
 	// Now add a temporary keybase
-	kbHome, cleanUp, err := tests.GetTempDir("Test_runShowCmd")
-	assert.NoError(t, err)
+	kbHome, cleanUp := tests.NewTestCaseDir(t)
 	defer cleanUp()
 	viper.Set(cli.HomeFlag, kbHome)
 

client/keys/update_test.go

@@ -39,8 +39,7 @@ func Test_runUpdateCmd(t *testing.T) {
 
 	// Prepare a key base
 	// Now add a temporary keybase
-	kbHome, cleanUp1, err := tests.GetTempDir("Test_runShowCmd")
-	assert.NoError(t, err)
+	kbHome, cleanUp1 := tests.NewTestCaseDir(t)
 	defer cleanUp1()
 	viper.Set(cli.HomeFlag, kbHome)