X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fprometheus%2Ftests%2Ftest_charm.py;fp=installers%2Fcharm%2Fprometheus%2Ftests%2Ftest_charm.py;h=87d7bc5c2a0e60c331da12fa9190c914372f3a3f;hb=51bb2563cf26ba7c7797f499d0e5069371efb8e5;hp=0f902a5548c5e59ea0bfeb118dfa769f7931f68d;hpb=7527a6348d19ef4afbc11a20cec7f419aaf59c7d;p=osm%2Fdevops.git

diff --git a/installers/charm/prometheus/tests/test_charm.py b/installers/charm/prometheus/tests/test_charm.py
index 0f902a55..87d7bc5c 100644
--- a/installers/charm/prometheus/tests/test_charm.py
+++ b/installers/charm/prometheus/tests/test_charm.py
@@ -63,26 +63,24 @@ class TestCharm(unittest.TestCase):
                                 {
                                     "path": "prometheus.yml",
                                     "content": (
-                                        "global:"
-                                        "  scrape_interval: 15s"
-                                        "  evaluation_interval: 15s"
-                                        "alerting:"
-                                        "  alertmanagers:"
-                                        "    - static_configs:"
-                                        "        - targets:"
-                                        "rule_files:"
-                                        "scrape_configs:"
-                                        "  - job_name: 'prometheus'"
-                                        "    static_configs:"
-                                        "      - targets: [{}]".format("")
+                                        "global:\n"
+                                        "  scrape_interval: 15s\n"
+                                        "  evaluation_interval: 15s\n"
+                                        "alerting:\n"
+                                        "  alertmanagers:\n"
+                                        "    - static_configs:\n"
+                                        "        - targets:\n"
+                                        "rule_files:\n"
+                                        "scrape_configs:\n"
+                                        "  - job_name: 'prometheus'\n"
+                                        "    static_configs:\n"
+                                        "      - targets: [{}]\n".format("")
                                     ),
                                 }
                             ],
                         }
                     ],
                     "command": [
-                        "sh",
-                        "-c",
                         "/bin/prometheus",
                         "--config.file=/etc/prometheus/prometheus.yml",
                         "--storage.tsdb.path=/prometheus",
@@ -148,26 +146,24 @@ class TestCharm(unittest.TestCase):
                                 {
                                     "path": "prometheus.yml",
                                     "content": (
-                                        "global:"
-                                        "  scrape_interval: 15s"
-                                        "  evaluation_interval: 15s"
-                                        "alerting:"
-                                        "  alertmanagers:"
-                                        "    - static_configs:"
-                                        "        - targets:"
-                                        "rule_files:"
-                                        "scrape_configs:"
-                                        "  - job_name: 'prometheus'"
-                                        "    static_configs:"
-                                        "      - targets: [{}]".format("")
+                                        "global:\n"
+                                        "  scrape_interval: 15s\n"
+                                        "  evaluation_interval: 15s\n"
+                                        "alerting:\n"
+                                        "  alertmanagers:\n"
+                                        "    - static_configs:\n"
+                                        "        - targets:\n"
+                                        "rule_files:\n"
+                                        "scrape_configs:\n"
+                                        "  - job_name: 'prometheus'\n"
+                                        "    static_configs:\n"
+                                        "      - targets: [{}]\n".format("")
                                     ),
                                 }
                             ],
                         }
                     ],
                     "command": [
-                        "sh",
-                        "-c",
                         "/bin/prometheus",
                         "--config.file=/etc/prometheus/prometheus.yml",
                         "--storage.tsdb.path=/prometheus",
@@ -260,26 +256,24 @@ class TestCharm(unittest.TestCase):
                                 {
                                     "path": "prometheus.yml",
                                     "content": (
-                                        "global:"
-                                        "  scrape_interval: 15s"
-                                        "  evaluation_interval: 15s"
-                                        "alerting:"
-                                        "  alertmanagers:"
-                                        "    - static_configs:"
-                                        "        - targets:"
-                                        "rule_files:"
-                                        "scrape_configs:"
-                                        "  - job_name: 'prometheus'"
-                                        "    static_configs:"
-                                        "      - targets: [{}]".format("")
+                                        "global:\n"
+                                        "  scrape_interval: 15s\n"
+                                        "  evaluation_interval: 15s\n"
+                                        "alerting:\n"
+                                        "  alertmanagers:\n"
+                                        "    - static_configs:\n"
+                                        "        - targets:\n"
+                                        "rule_files:\n"
+                                        "scrape_configs:\n"
+                                        "  - job_name: 'prometheus'\n"
+                                        "    static_configs:\n"
+                                        "      - targets: [{}]\n".format("")
                                     ),
                                 }
                             ],
                         }
                     ],
                     "command": [
-                        "sh",
-                        "-c",
                         "/bin/prometheus",
                         "--config.file=/etc/prometheus/prometheus.yml",
                         "--storage.tsdb.path=/prometheus",
@@ -376,26 +370,24 @@ class TestCharm(unittest.TestCase):
                                 {
                                     "path": "prometheus.yml",
                                     "content": (
-                                        "global:"
-                                        "  scrape_interval: 15s"
-                                        "  evaluation_interval: 15s"
-                                        "alerting:"
-                                        "  alertmanagers:"
-                                        "    - static_configs:"
-                                        "        - targets:"
-                                        "rule_files:"
-                                        "scrape_configs:"
-                                        "  - job_name: 'prometheus'"
-                                        "    static_configs:"
-                                        "      - targets: [{}]".format("")
+                                        "global:\n"
+                                        "  scrape_interval: 15s\n"
+                                        "  evaluation_interval: 15s\n"
+                                        "alerting:\n"
+                                        "  alertmanagers:\n"
+                                        "    - static_configs:\n"
+                                        "        - targets:\n"
+                                        "rule_files:\n"
+                                        "scrape_configs:\n"
+                                        "  - job_name: 'prometheus'\n"
+                                        "    static_configs:\n"
+                                        "      - targets: [{}]\n".format("")
                                     ),
                                 }
                             ],
                         }
                     ],
                     "command": [
-                        "sh",
-                        "-c",
                         "/bin/prometheus",
                         "--config.file=/etc/prometheus/prometheus.yml",
                         "--storage.tsdb.path=/prometheus",