Fixed tests now log output includes severity and timestamp

markround · Jun 12, 2018 · c718ee8 · c718ee8
1 parent d5b4f87
commit c718ee8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 37 deletions.
diff --git a/features/config_d.feature b/features/config_d.feature
@@ -68,17 +68,11 @@ Feature: Configuration from config.d
     """
     Test var : From 02-environments.yaml
     """
-    And the output should contain:
-    """
-    Loading config file ./config.d/00-base.yaml
-    Loading config file ./config.d/01-defaults.yaml
-    Loading config file ./config.d/02-environments.yaml
-    """
-    And the output should contain:
-    """
-    Merging duplicate data values
-    test_var => 'From defaults module' being replaced by : 'From 02-environments.yaml' from FileDataSource
-    """
+    And the output should contain "Loading config file ./config.d/00-base.yaml"
+    And the output should contain "Loading config file ./config.d/01-defaults.yaml"
+    And the output should contain "Loading config file ./config.d/02-environments.yaml"
+    And the output should contain "Merging duplicate data values"
+    And the output should contain "test_var => 'From defaults module' being replaced by : 'From 02-environments.yaml' from FileDataSource"
 
   Scenario: Add additional templates in later configuration
     Given a file named "config.d/00-base.yaml" with:
@@ -117,9 +111,7 @@ Feature: Configuration from config.d
     """
     Additional var : From 02-development-additional.yaml
     """
-    And the output should contain:
-    """
-    Loading config file ./config.d/00-base.yaml
-    Loading config file ./config.d/01-development-base.yaml
-    Loading config file ./config.d/02-development-additional.yaml
-    """
+    And the output should contain "Loading config file ./config.d/00-base.yaml"
+    And the output should contain "Loading config file ./config.d/01-development-base.yaml"
+    And the output should contain "Loading config file ./config.d/02-development-additional.yaml"
+
diff --git a/features/json.feature b/features/json.feature
@@ -24,11 +24,9 @@ Feature: JSON environment data source
      * Key 1 is : value1
      * Key 2 is : value2
     """
-    And the output should contain:
-    """
-    default_value => 'from defaults' being replaced by : 'From the file datasource' from FileDataSource
-    default_value => 'From the file datasource' being replaced by : 'from JSON!' from EnvironmentJsonDataSource
-    """
+    And the output should contain "default_value => 'from defaults' being replaced by : 'From the file datasource' from FileDataSource"
+    And the output should contain "default_value => 'From the file datasource' being replaced by : 'from JSON!' from EnvironmentJsonDataSource"
+
 
   Scenario: Simple data from environment v2 format
     Given I use a fixture named "json"

diff --git a/features/md5sum_noexec.feature b/features/md5sum_noexec.feature
@@ -41,10 +41,10 @@ Feature: MD5 file checksums with noexec
     """
     test_var: This is a variable from the file datasource
     """
+    And the output should contain "[2/2] templates written, [0] skipped with no change"
+    And the output should contain "Template generation completed"
     And the output should contain:
     """
-    [2/2] templates written, [0] skipped with no change
-    Template generation completed
     Executing ["true"]...
     """
 
@@ -71,10 +71,7 @@ Feature: MD5 file checksums with noexec
     test_var: This is a variable from the file datasource
     """
     When I successfully run `tiller -b . -d -e development`
-    Then the output should contain:
-    """
-    [0/2] templates written, [2] skipped with no change
-    Template generation completed
-    No templates written, stopping without exec
-    """
+    Then the output should contain "[0/2] templates written, [2] skipped with no change"
+    Then the output should contain "Template generation completed"
+    Then the output should contain "No templates written, stopping without exec"
 
diff --git a/features/precedence.feature b/features/precedence.feature
@@ -86,10 +86,6 @@ Feature: Test new value precedence and merging behaviour
     """
     test_var: from environment
     """
-    And the output should contain:
-    """
-    Merging duplicate data values
-    test_var => 'From defaults plugin' being replaced by : 'From file plugin' from FileDataSource
-    test_var => 'From file plugin' being replaced by : 'from environment' from EnvironmentDataSource
-    """
-
+    And the output should contain "Merging duplicate data values"
+    And the output should contain "test_var => 'From defaults plugin' being replaced by : 'From file plugin' from FileDataSource"
+    And the output should contain "test_var => 'From file plugin' being replaced by : 'from environment' from EnvironmentDataSource"