keep machine config and machine env consistent

Signed-off-by: Ke Zhu <kzhu@us.ibm.com>

commands.go

@@ -356,7 +356,7 @@ func cmdConfig(c *cli.Context) {
 
 		dockerHost = fmt.Sprintf("tcp://%s:%s", machineIp, swarmPort)
 	}
-	fmt.Printf("--tls --tlscacert=%s --tlscert=%s --tlskey=%s -H=%q",
+	fmt.Printf("--tls --tlscacert=%s --tlscert=%s --tlskey=%s -H=%s",
 		cfg.caCertPath, cfg.clientCertPath, cfg.clientKeyPath, dockerHost)
 }
 

commands_test.go

@@ -1,10 +1,13 @@
 package main
 
 import (
+	"bytes"
 	"flag"
+	"io"
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"strings"
 	"testing"
 
 	"github.com/codegangsta/cli"
@@ -293,3 +296,54 @@ func TestRunActionForeachMachine(t *testing.T) {
 		}
 	}
 }
+
+func TestCmdConfig(t *testing.T) {
+	stdout := os.Stdout
+	r, w, _ := os.Pipe()
+	os.Stdout = w
+
+	os.Setenv("MACHINE_STORAGE_PATH", TestStoreDir)
+
+	defer func() {
+		os.Setenv("MACHINE_STORAGE_PATH", "")
+		os.Stdout = stdout
+		w.Close()
+	}()
+
+	if err := clearHosts(); err != nil {
+		t.Fatal(err)
+	}
+
+	flags := getDefaultTestDriverFlags()
+
+	store := NewStore(TestMachineDir, "", "")
+	var err error
+
+	_, err = store.Create("test-a", "none", flags)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	host, err := store.Load("test-a")
+	if err != nil {
+		t.Fatalf("error loading host: %v", err)
+	}
+
+	if err := store.SetActive(host); err != nil {
+		t.Fatalf("error setting active host: %v", err)
+	}
+
+	set := flag.NewFlagSet("config", 0)
+
+	testOutput := &bytes.Buffer{}
+
+	go io.Copy(testOutput, r)
+
+	c := cli.NewContext(nil, set, set)
+
+	cmdConfig(c)
+
+	if strings.Contains(testOutput.String(), "-H=unix:///var/run/docker.sock") {
+		t.Fatalf("Expect docker host URL")
+	}
+}