[Telegraf] Simplify tests

manala · Oct 20, 2020 · 4af9618 · 4af9618
1 parent 458de17
commit 4af9618
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 52 deletions.
diff --git a/tests/0200_config.goss.yml b/tests/0200_config.goss.yml
@@ -14,48 +14,48 @@ file:
     group: root
     mode: "0644"
     contains:
-      - "/^\\[global_tags\\]$/"
-      - "/^foo = \"bar\"$/"
-      - "/^\\[agent\\]$/"
-      - "/^hostname = \"test.manala.dev\"$/"
-      - "/^quiet = true$/"
-      - "/^metric_batch_size = 1234$/"
+      - "[global_tags]"
+      - 'foo = "bar"'
+      - "[agent]"
+      - 'hostname = "test.manala.dev"'
+      - "quiet = true"
+      - "metric_batch_size = 1234"
   tmp/config/default/default_deprecated.conf:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
     contains:
-      - "/^\\[global_tags\\]$/"
-      - "/^  foo = \"bar\"$/"
-      - "/^\\[agent\\]$/"
-      - "/^  hostname = \"test.manala.dev\"$/"
-      - "/^  quiet = true$/"
-      - "/^  metric_batch_size = 1234$/"
+      - "[global_tags]"
+      - '  foo = "bar"'
+      - "[agent]"
+      - '  hostname = "test.manala.dev"'
+      - "  quiet = true"
+      - "  metric_batch_size = 1234"
   tmp/config/default/default_content.conf:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
     contains:
-      - "/^\\[global_tags\\]$/"
-      - "/^  foo = \"bar\"$/"
-      - "/^\\[agent\\]$/"
-      - "/^  hostname = \"test.manala.dev\"$/"
-      - "/^  quiet = true$/"
-      - "/^  metric_batch_size = 1234$/"
+      - "[global_tags]"
+      - '  foo = "bar"'
+      - "[agent]"
+      - '  hostname = "test.manala.dev"'
+      - "  quiet = true"
+      - "  metric_batch_size = 1234"
   tmp/config/default/template.conf:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
     contains:
-      - "/^\\[global_tags\\]$/"
-      - "/^  foo = \"bar\"$/"
-      - "/^\\[agent\\]$/"
-      - "/^  hostname = \"test.manala.dev\"$/"
-      - "/^  quiet = true$/"
-      - "/^  metric_batch_size = 1234$/"
+      - "[global_tags]"
+      - '  foo = "bar"'
+      - "[agent]"
+      - '  hostname = "test.manala.dev"'
+      - "  quiet = true"
+      - "  metric_batch_size = 1234"
diff --git a/tests/0300_configs.goss.yml b/tests/0300_configs.goss.yml
@@ -16,52 +16,52 @@ file:
     group: root
     mode: "0644"
     contains:
-      - "/^\\[\\[inputs.cpu\\]\\]$/"
-      - "/^percpu = true$/"
-      - "/^totalcpu = false$/"
-      - "/^\\[inputs.cpu.tags\\]$/"
-      - "/^tag-1 = \"foo\"$/"
-      - "/^tag-2 = \"bar\"$/"
-      - "/^\\[inputs.cpu.tagdrop\\]$/"
-      - "/^cpu = \\[\"cpu6\", \"cpu7\"\\]$/"
+      - "[[inputs.cpu]]"
+      - "percpu = true"
+      - "totalcpu = false"
+      - "[inputs.cpu.tags]"
+      - 'tag-1 = "foo"'
+      - 'tag-2 = "bar"'
+      - "[inputs.cpu.tagdrop]"
+      - 'cpu = ["cpu6", "cpu7"]'
   tmp/configs/default/default_content.conf:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
     contains:
-      - "/^\\[\\[inputs.cpu\\]\\]$/"
-      - "/^  percpu = true$/"
-      - "/^  totalcpu = false$/"
-      - "/^  \\[inputs.cpu.tags\\]$/"
-      - "/^    tag-1 = \"foo\"$/"
-      - "/^    tag-2 = \"bar\"$/"
-      - "/^  \\[inputs.cpu.tagdrop\\]$/"
-      - "/^    cpu = \\[\"cpu6\", \"cpu7\"\\]$/"
+      - "[[inputs.cpu]]"
+      - "  percpu = true"
+      - "  totalcpu = false"
+      - "  [inputs.cpu.tags]"
+      - '    tag-1 = "foo"'
+      - '    tag-2 = "bar"'
+      - "  [inputs.cpu.tagdrop]"
+      - '    cpu = ["cpu6", "cpu7"]'
   tmp/configs/default/template.conf:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
     contains:
-      - "/^Configs foo$/"
+      - "Configs foo"
   tmp/configs/default/template_deprecated.conf:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
     contains:
-      - "/^\\[\\[inputs.cpu\\]\\]$/"
-      - "/^  percpu = true$/"
-      - "/^  totalcpu = false$/"
-      - "/^  \\[inputs.cpu.tags\\]$/"
-      - "/^    tag-1 = \"foo\"$/"
-      - "/^    tag-2 = \"bar\"$/"
-      - "/^  \\[inputs.cpu.tagdrop\\]$/"
-      - "/^    cpu = \\[\"cpu6\", \"cpu7\"\\]$/"
+      - "[[inputs.cpu]]"
+      - "  percpu = true"
+      - "  totalcpu = false"
+      - "  [inputs.cpu.tags]"
+      - '    tag-1 = "foo"'
+      - '    tag-2 = "bar"'
+      - "  [inputs.cpu.tagdrop]"
+      - '    cpu = ["cpu6", "cpu7"]'
 {{ end }}
 
 # State
@@ -100,23 +100,23 @@ file:
     group: root
     mode: "0644"
     contains:
-      - "/^Configs foo$/"
+      - "Configs foo"
   tmp/configs/defaults/bar.conf:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
     contains:
-      - "/^Configs bar$/"
+      - "Configs bar"
   tmp/configs/defaults/baz.conf:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
     contains:
-      - "/^Configs bar$/"
+      - "Configs bar"
 {{ end }}
 
 # Exclusive