From a4437a037179dced4c2b9fd1aea57e1def8a1296 Mon Sep 17 00:00:00 2001 From: vishalnayak Date: Tue, 18 Aug 2015 15:40:52 -0700 Subject: [PATCH] Vault SSH: Fix backend test cases --- builtin/logical/ssh/backend_test.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/builtin/logical/ssh/backend_test.go b/builtin/logical/ssh/backend_test.go index 677b6cebe8..8ff3902e90 100644 --- a/builtin/logical/ssh/backend_test.go +++ b/builtin/logical/ssh/backend_test.go @@ -2,8 +2,8 @@ package ssh import ( "fmt" - "io/ioutil" "os/user" + "strconv" "strings" "testing" @@ -69,7 +69,10 @@ func init() { } input := strings.Split(addr, ":") testIP = input[0] - testPort = input[1] + testPort, err = strconv.Atoi(input[1]) + if err != nil { + panic(fmt.Sprintf("error parsing port number:%s", err)) + } u, err := user.Current() if err != nil { @@ -77,12 +80,7 @@ func init() { } testUserName = u.Username testAdminUser = u.Username - scriptBytes, err := ioutil.ReadFile("scripts/key-install-linux.sh") - if err != nil { - panic(fmt.Sprintf("error reading install script file: '%s'", err)) - } - testInstallScript = string(scriptBytes) - + testInstallScript = DefaultPublicKeyInstallScript } func TestSSHBackend_Lookup(t *testing.T) { @@ -98,6 +96,7 @@ func TestSSHBackend_Lookup(t *testing.T) { "key_type": testDynamicKeyType, "key": testKeyName, "admin_user": testAdminUser, + "default_user": testAdminUser, "cidr_list": testCIDRList, "install_script": testInstallScript, } @@ -151,6 +150,7 @@ func TestSSHBackend_DynamicRoleCrud(t *testing.T) { "key_type": testDynamicKeyType, "key": testKeyName, "admin_user": testAdminUser, + "default_user": testAdminUser, "cidr_list": testCIDRList, "install_script": testInstallScript, } @@ -331,6 +331,7 @@ func testNewDynamicKeyRole(t *testing.T) logicaltest.TestStep { "key_type": "dynamic", "key": testKeyName, "admin_user": testAdminUser, + "default_user": testAdminUser, "cidr_list": testCIDRList, "port": testPort, "install_script": testInstallScript,