Add retry interval

Author: SimonBaeumer

pkg/runtime/runtime.go

@@ -36,10 +36,11 @@ type TestCase struct {
 
 //TestConfig represents the configuration for a test
 type TestConfig struct {
-	Env     map[string]string
-	Dir     string
-	Timeout string
-	Retries int
+	Env      map[string]string
+	Dir      string
+	Timeout  string
+	Retries  int
+	Interval string
 }
 
 // ResultStatus represents the status code of a test result
@@ -74,11 +75,12 @@ type ExpectedOut struct {
 
 // CommandUnderTest represents the command under test
 type CommandUnderTest struct {
-	Cmd     string
-	Env     map[string]string
-	Dir     string
-	Timeout string
-	Retries int
+	Cmd      string
+	Env      map[string]string
+	Dir      string
+	Timeout  string
+	Retries  int
+	Interval string
 }
 
 // TestResult represents the TestCase and the ValidationResult

pkg/suite/yaml_suite.go

@@ -15,10 +15,11 @@ type YAMLConfig struct {
 
 // YAMLTestConfig is a struct to represent the test config
 type YAMLTestConfig struct {
-	Env     map[string]string `yaml:"env,omitempty"`
-	Dir     string            `yaml:"dir,omitempty"`
-	Timeout string            `yaml:"timeout,omitempty"`
-	Retries int               `yaml:"retries,omitempty"`
+	Env      map[string]string `yaml:"env,omitempty"`
+	Dir      string            `yaml:"dir,omitempty"`
+	Timeout  string            `yaml:"timeout,omitempty"`
+	Retries  int               `yaml:"retries,omitempty"`
+	Interval string            `yaml:"interval,omitempty"`
 }
 
 // YAMLTest represents a test in the yaml test suite
@@ -69,10 +70,11 @@ func ParseYAML(content []byte) Suite {
 	return YAMLSuite{
 		TestCases: convertYAMLConfToTestCases(yamlConfig),
 		Config: runtime.TestConfig{
-			Env:     yamlConfig.Config.Env,
-			Dir:     yamlConfig.Config.Dir,
-			Timeout: yamlConfig.Config.Timeout,
-			Retries: yamlConfig.Config.Retries,
+			Env:      yamlConfig.Config.Env,
+			Dir:      yamlConfig.Config.Dir,
+			Timeout:  yamlConfig.Config.Timeout,
+			Retries:  yamlConfig.Config.Retries,
+			Interval: yamlConfig.Config.Interval,
 		},
 	}
 }
@@ -84,11 +86,12 @@ func convertYAMLConfToTestCases(conf YAMLConfig) []runtime.TestCase {
 		tests = append(tests, runtime.TestCase{
 			Title: t.Title,
 			Command: runtime.CommandUnderTest{
-				Cmd:     t.Command,
-				Env:     t.Config.Env,
-				Dir:     t.Config.Dir,
-				Timeout: t.Config.Timeout,
-				Retries: t.Config.Retries,
+				Cmd:      t.Command,
+				Env:      t.Config.Env,
+				Dir:      t.Config.Dir,
+				Timeout:  t.Config.Timeout,
+				Retries:  t.Config.Retries,
+				Interval: t.Config.Interval,
 			},
 			Expected: runtime.Expected{
 				ExitCode: t.ExitCode,
@@ -140,10 +143,11 @@ func (y *YAMLConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
 
 	//Parse global configuration
 	y.Config = YAMLTestConfig{
-		Env:     params.Config.Env,
-		Dir:     params.Config.Dir,
-		Timeout: params.Config.Timeout,
-		Retries: params.Config.Retries,
+		Env:      params.Config.Env,
+		Dir:      params.Config.Dir,
+		Timeout:  params.Config.Timeout,
+		Retries:  params.Config.Retries,
+		Interval: params.Config.Interval,
 	}
 
 	return nil
@@ -239,6 +243,10 @@ func (y *YAMLConfig) mergeConfigs(local YAMLTestConfig, global YAMLTestConfig) Y
 		conf.Retries = local.Retries
 	}
 
+	if local.Interval != "" {
+		conf.Interval = local.Interval
+	}
+
 	return conf
 }
 

pkg/suite/yaml_suite_test.go

@@ -184,6 +184,7 @@ config:
     dir: /home/commander/
     timeout: 10ms
     retries: 2
+    interval: 500ms
 
 tests:
     echo hello:
@@ -194,18 +195,21 @@ tests:
            dir: /home/test
            timeout: 1s
            retries: 10
+           interval: 5s
 `)
 
 	got := ParseYAML(yaml)
 	assert.Equal(t, map[string]string{"KEY": "global", "ANOTHER_KEY": "another_global"}, got.GetGlobalConfig().Env)
 	assert.Equal(t, "/home/commander/", got.GetGlobalConfig().Dir)
 	assert.Equal(t, "10ms", got.GetGlobalConfig().Timeout)
 	assert.Equal(t, 2, got.GetGlobalConfig().Retries)
+	assert.Equal(t, "500ms", got.GetGlobalConfig().Interval)
 
 	assert.Equal(t, map[string]string{"KEY": "local", "ANOTHER_KEY": "another_global"}, got.GetTests()[0].Command.Env)
 	assert.Equal(t, "/home/test", got.GetTests()[0].Command.Dir)
 	assert.Equal(t, "1s", got.GetTests()[0].Command.Timeout)
 	assert.Equal(t, 10, got.GetTests()[0].Command.Retries)
+	assert.Equal(t, "5s", got.GetTests()[0].Command.Interval)
 }
 
 func TestYAMLSuite_ShouldThrowAnErrorIfFieldIsNotRegistered(t *testing.T) {