Test the Vagrant driver

Author: mlafeldt

driver/vagrant/driver.go

@@ -27,9 +27,9 @@ const (
 
 // Driver is a driver based on Vagrant.
 type Driver struct {
-	machine     string
-	sshClient   *openssh.Client
-	rsyncClient *rsync.Client
+	Machine     string
+	SSHClient   *openssh.Client
+	RsyncClient *rsync.Client
 }
 
 func init() {
@@ -75,15 +75,15 @@ func NewDriver(machine string) (*Driver, error) {
 
 // RunCommand runs the specified command on the Vagrant machine.
 func (drv Driver) RunCommand(args []string) error {
-	return drv.sshClient.RunCommand(args)
+	return drv.SSHClient.RunCommand(args)
 }
 
 // Upload copies files to the Vagrant machine.
 func (drv Driver) Upload(dst string, src ...string) error {
-	return drv.rsyncClient.Copy(dst, src...)
+	return drv.RsyncClient.Copy(dst, src...)
 }
 
 // String returns the driver's name.
 func (drv Driver) String() string {
-	return fmt.Sprintf("Vagrant driver (machine: %s)", drv.machine)
+	return fmt.Sprintf("Vagrant driver (machine: %s)", drv.Machine)
 }

driver/vagrant/driver_test.go

@@ -1,20 +1,44 @@
-package vagrant
+package vagrant_test
 
 import (
+	"os"
 	"testing"
 
 	"github.com/mlafeldt/chef-runner/driver"
+	. "github.com/mlafeldt/chef-runner/driver/vagrant"
+	"github.com/mlafeldt/chef-runner/log"
+	"github.com/mlafeldt/chef-runner/util"
 	"github.com/stretchr/testify/assert"
 )
 
+func init() {
+	// Be quiet during testing
+	log.SetLevel(log.LevelWarn)
+}
+
 func TestDriverInterface(t *testing.T) {
 	assert.Implements(t, (*driver.Driver)(nil), new(Driver))
 }
 
+func TestNewDriver(t *testing.T) {
+	util.InDir("../../testdata", func() {
+		oldPath := os.Getenv("PATH")
+		os.Setenv("PATH", "./bin:/usr/bin:/bin")
+		defer os.Setenv("PATH", oldPath)
+
+		drv, err := NewDriver("some-machine")
+		if assert.NoError(t, err) {
+			defer os.RemoveAll(".chef-runner")
+			assert.Equal(t, "default", drv.SSHClient.Host)
+			assert.Equal(t, ".chef-runner/vagrant/machines/some-machine/ssh_config",
+				drv.SSHClient.ConfigFile)
+			assert.Equal(t, "default", drv.RsyncClient.RemoteHost)
+		}
+	})
+}
+
 func TestString(t *testing.T) {
 	expect := "Vagrant driver (machine: some-machine)"
-	actual := Driver{machine: "some-machine"}.String()
+	actual := Driver{Machine: "some-machine"}.String()
 	assert.Equal(t, expect, actual)
 }
-
-// TODO: test driver machinery

testdata/bin/vagrant

@@ -0,0 +1,21 @@
+#!/bin/sh
+# Vagrant stub for testing
+
+if test "$1 $2" = "ssh-config some-machine"; then
+    cat <<EOF
+Host default
+  HostName 127.0.0.1
+  User vagrant
+  Port 2200
+  UserKnownHostsFile /dev/null
+  StrictHostKeyChecking no
+  PasswordAuthentication no
+  IdentityFile /Users/mlafeldt/.vagrant.d/insecure_private_key
+  IdentitiesOnly yes
+  LogLevel FATAL
+EOF
+    exit 0
+fi
+
+echo >&2 "invalid test args"
+exit 1