From b09272c65eaea739526786a1a6e0f161f3f3277d Mon Sep 17 00:00:00 2001 From: Robert Lin Date: Wed, 6 Jun 2018 18:24:16 -0700 Subject: [PATCH] Update tests for new script paths --- client/client.go | 4 ++-- client/client_test.go | 19 +++++++++---------- client/remote.go | 6 +++--- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/client/client.go b/client/client.go index f67b027e..3651b3dc 100644 --- a/client/client.go +++ b/client/client.go @@ -109,7 +109,7 @@ key to enable continuous deployment.`) // DaemonUp brings the daemon up on the remote instance. func (c *Client) DaemonUp(daemonVersion, host, daemonPort string) error { - scriptBytes, err := internal.Asset("client/bootstrap/daemon-up.sh") + scriptBytes, err := internal.Asset("client/scripts/daemon-up.sh") if err != nil { return err } @@ -121,7 +121,7 @@ func (c *Client) DaemonUp(daemonVersion, host, daemonPort string) error { // DaemonDown brings the daemon down on the remote instance func (c *Client) DaemonDown() error { - scriptBytes, err := internal.Asset("client/bootstrap/daemon-down.sh") + scriptBytes, err := internal.Asset("client/scripts/daemon-down.sh") if err != nil { return err } diff --git a/client/client_test.go b/client/client_test.go index 9e267aad..de94cf0b 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -112,18 +112,19 @@ func TestGetNewClient(t *testing.T) { func TestInstallDocker(t *testing.T) { session := &mockSSHRunner{} client := getIntegrationClient(session) - script, err := ioutil.ReadFile("bootstrap/docker.sh") + script, err := ioutil.ReadFile("scripts/docker.sh") assert.Nil(t, err) // Make sure the right command is run. - client.installDocker(session) + err = client.installDocker(session) + assert.Nil(t, err) assert.Equal(t, string(script), session.Calls[0]) } func TestDaemonUp(t *testing.T) { session := &mockSSHRunner{} client := getIntegrationClient(session) - script, err := ioutil.ReadFile("bootstrap/daemon-up.sh") + script, err := ioutil.ReadFile("scripts/daemon-up.sh") assert.Nil(t, err) actualCommand := fmt.Sprintf(string(script), "latest", "4303", "0.0.0.0") @@ -137,12 +138,10 @@ func TestDaemonUp(t *testing.T) { func TestKeyGen(t *testing.T) { session := &mockSSHRunner{} remote := getIntegrationClient(session) - script, err := ioutil.ReadFile("bootstrap/token.sh") + script, err := ioutil.ReadFile("scripts/token.sh") assert.Nil(t, err) tokenScript := fmt.Sprintf(string(script), "test") - // Make sure the right command is run. - // Make sure the right command is run. _, err = remote.getDaemonAPIToken(session, "test") assert.Nil(t, err) @@ -153,17 +152,17 @@ func TestBootstrap(t *testing.T) { session := &mockSSHRunner{} client := getIntegrationClient(session) - dockerScript, err := ioutil.ReadFile("bootstrap/docker.sh") + dockerScript, err := ioutil.ReadFile("scripts/docker.sh") assert.Nil(t, err) - keyScript, err := ioutil.ReadFile("bootstrap/keygen.sh") + keyScript, err := ioutil.ReadFile("scripts/keygen.sh") assert.Nil(t, err) - script, err := ioutil.ReadFile("bootstrap/token.sh") + script, err := ioutil.ReadFile("scripts/token.sh") assert.Nil(t, err) tokenScript := fmt.Sprintf(string(script), "test") - script, err = ioutil.ReadFile("bootstrap/daemon-up.sh") + script, err = ioutil.ReadFile("scripts/daemon-up.sh") assert.Nil(t, err) daemonScript := fmt.Sprintf(string(script), "test", "4303", "127.0.0.1") diff --git a/client/remote.go b/client/remote.go index 210a578c..010bd5ed 100644 --- a/client/remote.go +++ b/client/remote.go @@ -39,7 +39,7 @@ func (remote *RemoteVPS) GetIPAndPort() string { // installDocker installs docker on a remote vps. func (remote *RemoteVPS) installDocker(session SSHSession) error { - installDockerSh, err := internal.Asset("client/bootstrap/docker.sh") + installDockerSh, err := internal.Asset("client/scripts/docker.sh") if err != nil { return err } @@ -58,7 +58,7 @@ func (remote *RemoteVPS) installDocker(session SSHSession) error { // keyGen creates a public-private key-pair on the remote vps // and returns the public key. func (remote *RemoteVPS) keyGen(session SSHSession) (*bytes.Buffer, error) { - scriptBytes, err := internal.Asset("client/bootstrap/keygen.sh") + scriptBytes, err := internal.Asset("client/scripts/keygen.sh") if err != nil { return nil, err } @@ -77,7 +77,7 @@ func (remote *RemoteVPS) keyGen(session SSHSession) (*bytes.Buffer, error) { // getDaemonAPIToken returns the daemon API token for RESTful access // to the daemon. func (remote *RemoteVPS) getDaemonAPIToken(session SSHSession, daemonVersion string) (string, error) { - scriptBytes, err := internal.Asset("client/bootstrap/token.sh") + scriptBytes, err := internal.Asset("client/scripts/token.sh") if err != nil { return "", err }