Move nodes config from root to config property and add inhereitance support

Author: SimonBaeumer

README.md

@@ -137,6 +137,8 @@ config: # Config for all executed tests
         KEY: global
     timeout: 50s # Define a timeout for a command under test
     retries: 2 # Define retries for each test
+    nodes:
+    - ssh-host1 # define default hosts
 
 tests:
     echo hello: # Define command as title
@@ -164,7 +166,7 @@ tests:
         command: echo hello
         stdout:
             contains: 
-                - hello #See test "it should fail"
+              - hello #See test "it should fail"
             exactly: hello
             line-count: 1
         config:
@@ -175,6 +177,9 @@ tests:
                 ANOTHER: yeah # Add another env variable
             timeout: 1s # Overwrite timeout
             retries: 5
+            nodes: # overwrite default nodes
+              - docker-host1
+              - docker-host2
         exit-code: 0
 ```
 

commander_unix.yaml

@@ -72,7 +72,8 @@ tests:
       contains:
         - ✓ [ssh-host] it should test ssh host
         - ✓ [ssh-host] it should set env variable
-        - ✗ [local] it should test ssh host
-        - ✗ [ssh-host] it should fail if env could not be set
-        - "Failed setting env variables, maybe ssh server is configured to only accept LC_ prefixed env variables. Error: ssh: setenv failed"
-    exit-code: 1
+        - ✓ [ssh-host-default] it should be executed on ssh-host-default
+        - ✓ [ssh-host] it should test multiple hosts
+        - ✓ [ssh-host-default] it should test multiple hosts
+        - ✓ [local] it should test multiple hosts
+    exit-code: 0

integration/unix/nodes.yaml

@@ -5,12 +5,22 @@ nodes:
     identity-file: integration/containers/ssh/id_rsa
     addr: localhost:2222
 
+  ssh-host-default:
+    type: ssh
+    user: root
+    identity-file: integration/containers/ssh/id_rsa
+    addr: localhost:2222
+
+config:
+  nodes:
+    - ssh-host-default
+
 tests:
   it should test ssh host:
-    nodes:
-      - ssh-host
-      - local
     command: cat /root/int-test && whoami && pwd
+    config:
+      nodes:
+        - ssh-host
     stdout:
       contains:
         - test file ssh
@@ -19,19 +29,23 @@ tests:
     exit-code: 0
 
   it should set env variable:
-    nodes:
-      - ssh-host
     config:
+      nodes:
+        - ssh-host
       env:
         LC_TEST_ENV: env var
     command: echo $LC_TEST_ENV
     stdout: env var
 
-  it should fail if env could not be set:
-    nodes:
-      - ssh-host
+  it should be executed on ssh-host-default:
+    command: whoami
+    stdout: root
+
+  it should test multiple hosts:
+    command: echo hello
+    stdout: hello
     config:
-      env:
-        TEST_ENV: env var
-    command: echo $TEST_ENV
-    stdout: env var
+      nodes:
+      - ssh-host-default
+      - ssh-host
+      - local

pkg/runtime/runtime.go

@@ -72,6 +72,7 @@ type TestConfig struct {
 	Retries    int
 	Interval   string
 	InheritEnv bool
+	Nodes      []string
 }
 
 // ResultStatus represents the status code of a test result
@@ -115,7 +116,6 @@ type CommandUnderTest struct {
 	Timeout    string
 	Retries    int
 	Interval   string
-	Executors  []Executor
 }
 
 // TestResult represents the TestCase and the ValidationResult

pkg/suite/yaml_suite.go

@@ -23,6 +23,7 @@ type YAMLTestConfig struct {
 	Timeout    string            `yaml:"timeout,omitempty"`
 	Retries    int               `yaml:"retries,omitempty"`
 	Interval   string            `yaml:"interval,omitempty"`
+	Nodes      []string          `yaml:"nodes,omitempty"`
 }
 
 type NodeConf struct {
@@ -55,7 +56,6 @@ type YAMLTest struct {
 	Stdout   interface{}    `yaml:"stdout,omitempty"`
 	Stderr   interface{}    `yaml:"stderr,omitempty"`
 	Config   YAMLTestConfig `yaml:"config,omitempty"`
-	Nodes    []string       `yaml:"nodes,omitempty"`
 }
 
 // ParseYAML parses the Suite from a yaml byte slice
@@ -76,6 +76,7 @@ func ParseYAML(content []byte) Suite {
 			Timeout:    yamlConfig.Config.Timeout,
 			Retries:    yamlConfig.Config.Retries,
 			Interval:   yamlConfig.Config.Interval,
+			Nodes:      yamlConfig.Config.Nodes,
 		},
 		Nodes: convertNodes(yamlConfig.Nodes),
 	}
@@ -117,7 +118,7 @@ func convertYAMLConfToTestCases(conf YAMLConfig) []runtime.TestCase {
 				Stdout:   t.Stdout.(runtime.ExpectedOut),
 				Stderr:   t.Stderr.(runtime.ExpectedOut),
 			},
-			Nodes: t.Nodes,
+			Nodes: t.Config.Nodes,
 		})
 	}
 
@@ -152,7 +153,6 @@ func (y *YAMLConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
 			Stdout:   y.convertToExpectedOut(v.Stdout),
 			Stderr:   y.convertToExpectedOut(v.Stderr),
 			Config:   y.mergeConfigs(v.Config, params.Config),
-			Nodes:    v.Nodes,
 		}
 
 		// Set key as command, if command property was empty
@@ -185,6 +185,7 @@ func (y *YAMLConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
 		Timeout:    params.Config.Timeout,
 		Retries:    params.Config.Retries,
 		Interval:   params.Config.Interval,
+		Nodes:      params.Config.Nodes,
 	}
 
 	return nil
@@ -299,6 +300,10 @@ func (y *YAMLConfig) mergeConfigs(local YAMLTestConfig, global YAMLTestConfig) Y
 		conf.InheritEnv = local.InheritEnv
 	}
 
+	if len(local.Nodes) != 0 {
+		conf.Nodes = local.Nodes
+	}
+
 	return conf
 }
 

pkg/suite/yaml_suite_test.go

@@ -336,9 +336,10 @@ nodes:
        image: ubuntu:18.04
 tests:
    echo hello:
-      nodes:
-        - docker-host
-        - ssh-host1
+      config:
+        nodes:
+          - docker-host
+          - ssh-host1
       exit-code: 0
 `)