Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-10-21 03:12:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix shell out to docker-classic when invoking

Browse source
This commit is contained in:
Guillaume Tardif 2020-05-26 23:34:38 +02:00
parent d876f9e779
commit d2648da2d9
8 changed files with 26 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

31
context/store/store_test.go
View file

@ -107,22 +107,6 @@ func (suite *StoreTestSuite) TestGet() {
require.Equal(suite.T(), "type", meta.Type)
}
func (suite *StoreTestSuite) TestList() {
err := suite.store.Create("test1", "type", "description", ContextMetadata{})
require.Nil(suite.T(), err)
err = suite.store.Create("test2", "type", "description", ContextMetadata{})
require.Nil(suite.T(), err)
contexts, err := suite.store.List()
require.Nil(suite.T(), err)
require.Equal(suite.T(), len(contexts), 3)
require.Equal(suite.T(), "test1", contexts[0].Name)
require.Equal(suite.T(), "test2", contexts[1].Name)
require.Equal(suite.T(), "default", contexts[2].Name)
}
func (suite *StoreTestSuite) TestRemoveNotFound() {
err := suite.store.Remove("notfound")
require.EqualError(suite.T(), err, `context "notfound": not found`)
@ -132,17 +116,18 @@ func (suite *StoreTestSuite) TestRemoveNotFound() {
func (suite *StoreTestSuite) TestRemove() {
err := suite.store.Create("testremove", "type", "description", ContextMetadata{})
require.Nil(suite.T(), err)
contexts, err := suite.store.List()
meta, err := suite.store.Get("testremove")
require.Nil(suite.T(), err)
require.Equal(suite.T(), len(contexts), 2)
require.NotNil(suite.T(), meta)
err = suite.store.Remove("testremove")
require.Nil(suite.T(), err)
contexts, err = suite.store.List()
require.Nil(suite.T(), err)
// The default context is always here, that's why we
// have len(contexts) == 1
require.Equal(suite.T(), len(contexts), 1)
meta, err = suite.store.Get("testremove")
require.EqualError(suite.T(), err, `context "testremove": not found`)
require.Nil(suite.T(), meta)
}
func TestExampleTestSuite(t *testing.T) {

2
context/store/storedefault.go
View file

@ -32,7 +32,7 @@ type endpoint struct {
}
func dockerDefaultContext() (*Metadata, error) {
cmd := exec.Command("docker", "context", "inspect", "default")
cmd := exec.Command("docker-classic", "context", "inspect", "default")
var stdout bytes.Buffer
cmd.Stdout = &stdout
err := cmd.Run()

13
context/store/storedefault_test.go
View file

@ -1,13 +0,0 @@
package store
import (
"testing"
"github.com/stretchr/testify/assert"
)
func TestDefaultContext(t *testing.T) {
s, err := dockerDefaultContext()
assert.Nil(t, err)
assert.Equal(t, "default", s.Name)
}