hs-test: fix code style

[vpp.git] / extras / hs-test / container.go

diff --git a/extras/hs-test/container.go b/extras/hs-test/container.go
index 1dc65ff..4ad4548 100644 (file)
--- a/extras/hs-test/container.go
+++ b/extras/hs-test/container.go
@@ -47,7 +47,7 @@ func NewContainer(yamlInput ContainerConfig) (*Container, error) {
        }
 
        if _, ok := yamlInput["volumes"]; ok {
-               r:= strings.NewReplacer("$HST_DIR", workDir)
+               r := strings.NewReplacer("$HST_DIR", workDir)
                for _, volu := range yamlInput["volumes"].([]interface{}) {
                        volumeMap := volu.(ContainerConfig)
                        hostDir := r.Replace(volumeMap["host-dir"].(string))
@@ -55,8 +55,8 @@ func NewContainer(yamlInput ContainerConfig) (*Container, error) {
                        container.addVolume(hostDir, containerDir)
 
                        if isDefaultWorkDir, ok := volumeMap["is-default-work-dir"]; ok &&
-                       isDefaultWorkDir.(bool) &&
-                       len(container.workDir) == 0 {
+                               isDefaultWorkDir.(bool) &&
+                               len(container.workDir) == 0 {
                                container.workDir = containerDir
                        }
 
@@ -71,19 +71,23 @@ func NewContainer(yamlInput ContainerConfig) (*Container, error) {
        return container, nil
 }
 
-func (c *Container) run() error {
-       if c.name == "" {
-               return fmt.Errorf("create volume failed: container name is blank")
-       }
-
-       exechelper.Run(fmt.Sprintf("mkdir -p /tmp/%s/sync", c.name))
+func (c *Container) getRunCommand() string {
        syncPath := fmt.Sprintf(" -v %s:/tmp/sync", c.getSyncPath())
        cmd := "docker run --cap-add=all -d --privileged --network host --rm"
        cmd += syncPath
        cmd += c.getVolumesAsCliOption()
        cmd += c.getEnvVarsAsCliOption()
        cmd += " --name " + c.name + " " + c.image
-       fmt.Println(cmd)
+       return cmd
+}
+
+func (c *Container) run() error {
+       if c.name == "" {
+               return fmt.Errorf("run container failed: name is blank")
+       }
+
+       exechelper.Run(fmt.Sprintf("mkdir -p /tmp/%s/sync", c.name))
+       cmd := c.getRunCommand()
        err := exechelper.Run(cmd)
        if err != nil {
                return fmt.Errorf("container run failed: %s", err)