- Clear out some cruft tightly coupling libmachine to filestore - Comment out drivers other than virtualbox for now - Change way too many things - Mostly, break out the code to be more modular. - Destroy all traces of "provider" in its current form. It will be brought back as something more sensible, instead of something which overlaps in function with both Host and Store. - Fix mis-managed config passthru - Remove a few instances of state stored in env vars - This should be explicitly communicated in Go-land, not through the shell. - Rename "store" module to "persist" - This is done mostly to avoid confusion about the fact that a concrete instance of a "Store" interface is oftentimes referred to as "store" in the code. - Rip out repetitive antipattern for getting store - This replaces the previous repetive idiom for getting the cert info, and consequently the store, with a much less repetitive idiom. - Also, some redundant methods in commands.go for accessing hosts have either been simplified or removed entirely. - First steps towards fixing up tests - Test progress continues - Replace unit tests with integration tests - MAKE ALL UNIT TESTS PASS YAY - Add helper test files - Don't write to disk in libmachine/host - Heh.. coverage check strikes again - Fix remove code - Move cert code around - Continued progress: simplify Driver - Fixups and make creation work with new model - Move drivers module inside of libmachine - Move ssh module inside of libmachine - Move state module to libmachine - Move utils module to libmachine - Move version module to libmachine - Move log module to libmachine - Modify some constructor methods around - Change Travis build dep structure - Boring gofmt fix - Add version module - Move NewHost to store - Update some boring cert path infos to make API easier to use - Fix up some issues around the new model - Clean up some cert path stuff - Don't use shady functions to get store path :D - Continue artifact work - Fix silly machines dir bug - Continue fixing silly path issues - Change up output of vbm a bit - Continue work to make example go - Change output a little more - Last changes needed to make create finish properly - Fix config.go to use libmachine - Cut down code duplication and make both methods work with libmachine - Add pluggable logging implementation - Return error when machine already in desired state - Update example to show log method - Fix file:// bug - Fix Swarm defaults - Remove unused TLS settings from Engine and Swarm options - Remove spurious error - Correct bug detecting if migration was performed - Fix compilation errors from tests - Fix most of remaining test issues - Fix final silly bug in tests - Remove extraneous debug code - Add -race to test command - Appease the gofmt - Appease the generate coverage - Making executive decision to remove Travis coverage check In the early days I thought this would be a good idea because it would encourage people to write tests in case they added a new module. Well, in fact it has just turned into a giant nuisance and made refactoring work like this even more difficult. - Move Get to Load - Move HostListItem code to CLI Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
379 lines
9.2 KiB
Go
379 lines
9.2 KiB
Go
package commands
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"os"
|
|
"testing"
|
|
|
|
"github.com/docker/machine/drivers/fakedriver"
|
|
"github.com/docker/machine/libmachine/host"
|
|
"github.com/docker/machine/libmachine/state"
|
|
"github.com/docker/machine/libmachine/swarm"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
var (
|
|
hostTestStorePath string
|
|
stdout *os.File
|
|
)
|
|
|
|
func init() {
|
|
stdout = os.Stdout
|
|
}
|
|
|
|
func cleanup() {
|
|
os.Stdout = stdout
|
|
os.RemoveAll(hostTestStorePath)
|
|
}
|
|
|
|
func TestParseFiltersErrorsGivenInvalidFilter(t *testing.T) {
|
|
_, err := parseFilters([]string{"foo=bar"})
|
|
assert.EqualError(t, err, "Unsupported filter key 'foo'")
|
|
}
|
|
|
|
func TestParseFiltersSwarm(t *testing.T) {
|
|
actual, _ := parseFilters([]string{"swarm=foo"})
|
|
assert.Equal(t, actual, FilterOptions{SwarmName: []string{"foo"}})
|
|
}
|
|
|
|
func TestParseFiltersDriver(t *testing.T) {
|
|
actual, _ := parseFilters([]string{"driver=bar"})
|
|
assert.Equal(t, actual, FilterOptions{DriverName: []string{"bar"}})
|
|
}
|
|
|
|
func TestParseFiltersState(t *testing.T) {
|
|
actual, _ := parseFilters([]string{"state=Running"})
|
|
assert.Equal(t, actual, FilterOptions{State: []string{"Running"}})
|
|
}
|
|
|
|
func TestParseFiltersName(t *testing.T) {
|
|
actual, _ := parseFilters([]string{"name=dev"})
|
|
assert.Equal(t, actual, FilterOptions{Name: []string{"dev"}})
|
|
}
|
|
|
|
func TestParseFiltersAll(t *testing.T) {
|
|
actual, _ := parseFilters([]string{"swarm=foo", "driver=bar", "state=Stopped", "name=dev"})
|
|
assert.Equal(t, actual, FilterOptions{SwarmName: []string{"foo"}, DriverName: []string{"bar"}, State: []string{"Stopped"}, Name: []string{"dev"}})
|
|
}
|
|
|
|
func TestParseFiltersDuplicates(t *testing.T) {
|
|
actual, _ := parseFilters([]string{"swarm=foo", "driver=bar", "name=mark", "swarm=baz", "driver=qux", "state=Running", "state=Starting", "name=time"})
|
|
assert.Equal(t, actual, FilterOptions{SwarmName: []string{"foo", "baz"}, DriverName: []string{"bar", "qux"}, State: []string{"Running", "Starting"}, Name: []string{"mark", "time"}})
|
|
}
|
|
|
|
func TestParseFiltersValueWithEqual(t *testing.T) {
|
|
actual, _ := parseFilters([]string{"driver=bar=baz"})
|
|
assert.Equal(t, actual, FilterOptions{DriverName: []string{"bar=baz"}})
|
|
}
|
|
|
|
func TestFilterHostsReturnsSameGivenNoFilters(t *testing.T) {
|
|
opts := FilterOptions{}
|
|
hosts := []*host.Host{
|
|
{
|
|
Name: "testhost",
|
|
DriverName: "fakedriver",
|
|
HostOptions: &host.HostOptions{},
|
|
},
|
|
}
|
|
actual := filterHosts(hosts, opts)
|
|
assert.EqualValues(t, actual, hosts)
|
|
}
|
|
|
|
func TestFilterHostsReturnsEmptyGivenEmptyHosts(t *testing.T) {
|
|
opts := FilterOptions{
|
|
SwarmName: []string{"foo"},
|
|
}
|
|
hosts := []*host.Host{}
|
|
assert.Empty(t, filterHosts(hosts, opts))
|
|
}
|
|
|
|
func TestFilterHostsReturnsEmptyGivenNonMatchingFilters(t *testing.T) {
|
|
opts := FilterOptions{
|
|
SwarmName: []string{"foo"},
|
|
}
|
|
hosts := []*host.Host{
|
|
{
|
|
Name: "testhost",
|
|
DriverName: "fakedriver",
|
|
HostOptions: &host.HostOptions{},
|
|
},
|
|
}
|
|
assert.Empty(t, filterHosts(hosts, opts))
|
|
}
|
|
|
|
func TestFilterHostsBySwarmName(t *testing.T) {
|
|
opts := FilterOptions{
|
|
SwarmName: []string{"master"},
|
|
}
|
|
master :=
|
|
&host.Host{
|
|
Name: "master",
|
|
HostOptions: &host.HostOptions{
|
|
SwarmOptions: &swarm.SwarmOptions{Master: true, Discovery: "foo"},
|
|
},
|
|
}
|
|
node1 :=
|
|
&host.Host{
|
|
Name: "node1",
|
|
HostOptions: &host.HostOptions{
|
|
SwarmOptions: &swarm.SwarmOptions{Master: false, Discovery: "foo"},
|
|
},
|
|
}
|
|
othermaster :=
|
|
&host.Host{
|
|
Name: "othermaster",
|
|
HostOptions: &host.HostOptions{
|
|
SwarmOptions: &swarm.SwarmOptions{Master: true, Discovery: "bar"},
|
|
},
|
|
}
|
|
hosts := []*host.Host{master, node1, othermaster}
|
|
expected := []*host.Host{master, node1}
|
|
|
|
assert.EqualValues(t, filterHosts(hosts, opts), expected)
|
|
}
|
|
|
|
func TestFilterHostsByDriverName(t *testing.T) {
|
|
opts := FilterOptions{
|
|
DriverName: []string{"fakedriver"},
|
|
}
|
|
node1 :=
|
|
&host.Host{
|
|
Name: "node1",
|
|
DriverName: "fakedriver",
|
|
HostOptions: &host.HostOptions{},
|
|
}
|
|
node2 :=
|
|
&host.Host{
|
|
Name: "node2",
|
|
DriverName: "virtualbox",
|
|
HostOptions: &host.HostOptions{},
|
|
}
|
|
node3 :=
|
|
&host.Host{
|
|
Name: "node3",
|
|
DriverName: "fakedriver",
|
|
HostOptions: &host.HostOptions{},
|
|
}
|
|
hosts := []*host.Host{node1, node2, node3}
|
|
expected := []*host.Host{node1, node3}
|
|
|
|
assert.EqualValues(t, filterHosts(hosts, opts), expected)
|
|
}
|
|
|
|
func TestFilterHostsByState(t *testing.T) {
|
|
opts := FilterOptions{
|
|
State: []string{"Paused", "Saved", "Stopped"},
|
|
}
|
|
node1 :=
|
|
&host.Host{
|
|
Name: "node1",
|
|
DriverName: "fakedriver",
|
|
HostOptions: &host.HostOptions{},
|
|
Driver: &fakedriver.FakeDriver{MockState: state.Paused},
|
|
}
|
|
node2 :=
|
|
&host.Host{
|
|
Name: "node2",
|
|
DriverName: "virtualbox",
|
|
HostOptions: &host.HostOptions{},
|
|
Driver: &fakedriver.FakeDriver{MockState: state.Stopped},
|
|
}
|
|
node3 :=
|
|
&host.Host{
|
|
Name: "node3",
|
|
DriverName: "fakedriver",
|
|
HostOptions: &host.HostOptions{},
|
|
Driver: &fakedriver.FakeDriver{MockState: state.Running},
|
|
}
|
|
hosts := []*host.Host{node1, node2, node3}
|
|
expected := []*host.Host{node1, node2}
|
|
|
|
assert.EqualValues(t, filterHosts(hosts, opts), expected)
|
|
}
|
|
|
|
func TestFilterHostsByName(t *testing.T) {
|
|
opts := FilterOptions{
|
|
Name: []string{"fire", "ice", "earth", "a.?r"},
|
|
}
|
|
node1 :=
|
|
&host.Host{
|
|
Name: "fire",
|
|
DriverName: "fakedriver",
|
|
HostOptions: &host.HostOptions{},
|
|
Driver: &fakedriver.FakeDriver{MockState: state.Paused, MockName: "fire"},
|
|
}
|
|
node2 :=
|
|
&host.Host{
|
|
Name: "ice",
|
|
DriverName: "adriver",
|
|
HostOptions: &host.HostOptions{},
|
|
Driver: &fakedriver.FakeDriver{MockState: state.Paused, MockName: "ice"},
|
|
}
|
|
node3 :=
|
|
&host.Host{
|
|
Name: "air",
|
|
DriverName: "nodriver",
|
|
HostOptions: &host.HostOptions{},
|
|
Driver: &fakedriver.FakeDriver{MockState: state.Paused, MockName: "air"},
|
|
}
|
|
node4 :=
|
|
&host.Host{
|
|
Name: "water",
|
|
DriverName: "falsedriver",
|
|
HostOptions: &host.HostOptions{},
|
|
Driver: &fakedriver.FakeDriver{MockState: state.Paused, MockName: "water"},
|
|
}
|
|
hosts := []*host.Host{node1, node2, node3, node4}
|
|
expected := []*host.Host{node1, node2, node3}
|
|
|
|
assert.EqualValues(t, filterHosts(hosts, opts), expected)
|
|
}
|
|
|
|
func TestFilterHostsMultiFlags(t *testing.T) {
|
|
opts := FilterOptions{
|
|
SwarmName: []string{},
|
|
DriverName: []string{"fakedriver", "virtualbox"},
|
|
}
|
|
node1 :=
|
|
&host.Host{
|
|
Name: "node1",
|
|
DriverName: "fakedriver",
|
|
HostOptions: &host.HostOptions{},
|
|
}
|
|
node2 :=
|
|
&host.Host{
|
|
Name: "node2",
|
|
DriverName: "virtualbox",
|
|
HostOptions: &host.HostOptions{},
|
|
}
|
|
node3 :=
|
|
&host.Host{
|
|
Name: "node3",
|
|
DriverName: "softlayer",
|
|
HostOptions: &host.HostOptions{},
|
|
}
|
|
hosts := []*host.Host{node1, node2, node3}
|
|
expected := []*host.Host{node1, node2}
|
|
|
|
assert.EqualValues(t, filterHosts(hosts, opts), expected)
|
|
}
|
|
|
|
func TestFilterHostsDifferentFlagsProduceAND(t *testing.T) {
|
|
opts := FilterOptions{
|
|
DriverName: []string{"virtualbox"},
|
|
State: []string{"Running"},
|
|
}
|
|
node1 :=
|
|
&host.Host{
|
|
Name: "node1",
|
|
DriverName: "fakedriver",
|
|
HostOptions: &host.HostOptions{},
|
|
Driver: &fakedriver.FakeDriver{MockState: state.Paused},
|
|
}
|
|
node2 :=
|
|
&host.Host{
|
|
Name: "node2",
|
|
DriverName: "virtualbox",
|
|
HostOptions: &host.HostOptions{},
|
|
Driver: &fakedriver.FakeDriver{MockState: state.Stopped},
|
|
}
|
|
node3 :=
|
|
&host.Host{
|
|
Name: "node3",
|
|
DriverName: "fakedriver",
|
|
HostOptions: &host.HostOptions{},
|
|
Driver: &fakedriver.FakeDriver{MockState: state.Running},
|
|
}
|
|
hosts := []*host.Host{node1, node2, node3}
|
|
expected := []*host.Host{}
|
|
|
|
assert.EqualValues(t, filterHosts(hosts, opts), expected)
|
|
}
|
|
func captureStdout() (chan string, *os.File) {
|
|
r, w, _ := os.Pipe()
|
|
os.Stdout = w
|
|
|
|
out := make(chan string)
|
|
|
|
go func() {
|
|
var testOutput bytes.Buffer
|
|
io.Copy(&testOutput, r)
|
|
out <- testOutput.String()
|
|
}()
|
|
|
|
return out, w
|
|
}
|
|
|
|
func TestGetHostListItems(t *testing.T) {
|
|
defer cleanup()
|
|
|
|
hostListItemsChan := make(chan HostListItem)
|
|
|
|
hosts := []*host.Host{
|
|
{
|
|
Name: "foo",
|
|
DriverName: "fakedriver",
|
|
Driver: &fakedriver.FakeDriver{
|
|
MockState: state.Running,
|
|
},
|
|
HostOptions: &host.HostOptions{
|
|
SwarmOptions: &swarm.SwarmOptions{
|
|
Master: false,
|
|
Address: "",
|
|
Discovery: "",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Name: "bar",
|
|
DriverName: "fakedriver",
|
|
Driver: &fakedriver.FakeDriver{
|
|
MockState: state.Stopped,
|
|
},
|
|
HostOptions: &host.HostOptions{
|
|
SwarmOptions: &swarm.SwarmOptions{
|
|
Master: false,
|
|
Address: "",
|
|
Discovery: "",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Name: "baz",
|
|
DriverName: "fakedriver",
|
|
Driver: &fakedriver.FakeDriver{
|
|
MockState: state.Running,
|
|
},
|
|
HostOptions: &host.HostOptions{
|
|
SwarmOptions: &swarm.SwarmOptions{
|
|
Master: false,
|
|
Address: "",
|
|
Discovery: "",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
expected := map[string]state.State{
|
|
"foo": state.Running,
|
|
"bar": state.Stopped,
|
|
"baz": state.Running,
|
|
}
|
|
|
|
items := []HostListItem{}
|
|
for _, host := range hosts {
|
|
go getHostState(host, hostListItemsChan)
|
|
}
|
|
|
|
for i := 0; i < len(hosts); i++ {
|
|
items = append(items, <-hostListItemsChan)
|
|
}
|
|
|
|
for _, item := range items {
|
|
if expected[item.Name] != item.State {
|
|
t.Fatal("Expected state did not match for item", item)
|
|
}
|
|
}
|
|
}
|