Merge ~ballot/charm-telegraf/+git/telegraf-charm:snap_daemon_user into ~sajoupa/charm-telegraf:snap_daemon_user

[Benjamin Allot]

abc2234... by Benjamin Allot on 2021-02-10

Add xdist to allow faster test execution

6ef444a... by Laurent Sesquès on 2021-02-10

when using the snap, set config files ownership to snap_daemon https://snapcraft.io/docs/services-and-daemons

Reviewed-on: https://code.launchpad.net/~sajoupa/charm-telegraf/+git/telegraf-charm/+merge/397492
Reviewed-by: Benjamin Allot <email address hidden>

Unmerged commits

abc2234... by Benjamin Allot on 2021-02-10

Add xdist to allow faster test execution

2790fd2... by Benjamin Allot on 2021-02-10

Add parametrization for the install_method

Until all the tests are fixed, only the test_write_telegraf_file tests
is parametrized with both install_method.
Also, remove reference to unittests and convert to pure pytest.

dcc064a... by Benjamin Allot on 2021-02-10

Add a way to customize args upon tox calls for unit tests

6ef444a... by Laurent Sesquès on 2021-02-10

when using the snap, set config files ownership to snap_daemon https://snapcraft.io/docs/services-and-daemons

Reviewed-on: https://code.launchpad.net/~sajoupa/charm-telegraf/+git/telegraf-charm/+merge/397492
Reviewed-by: Benjamin Allot <email address hidden>

dabf651... by Haw Loeung on 2021-02-10

Add showing charm source version/commit in juju status output

Reviewed-on: https://code.launchpad.net/~hloeung/charm-telegraf/+git/charm-telegraf/+merge/397477
Reviewed-by: Joe Guo <email address hidden>

007ce0a... by Haw Loeung on 2021-02-04

Add showing charm source version/commit in juju status output

diff --git a/src/reactive/telegraf.py b/src/reactive/telegraf.py
index e8cfa01..d8fd268 100644
--- a/src/reactive/telegraf.py
+++ b/src/reactive/telegraf.py
@@ -1439,7 +1439,17 @@ def start_or_restart():
         time.sleep(0.1)
 
     if host.service_running(service):
-        hookenv.status_set("active", "Monitoring {}".format(get_remote_unit_name()))
+        revision = ''
+        if os.path.exists('version'):
+            with open('version') as f:
+                line = f.readline().strip()
+            # We only want the first 8 characters, that's enough to tell
+            # which version of the charm we're using.
+            if len(line) > 8:
+                revision = ' (source version/commit {}…)'.format(line[:8])
+            else:
+                revision = ' (source version/commit {})'.format(line)
+        hookenv.status_set("active", "Monitoring {}{}".format(get_remote_unit_name(), revision))
         clear_flag("telegraf.needs_reload")
     else:
         hookenv.status_set("blocked", "Telegraf failed to start. Check config.")
diff --git a/src/tests/unit/requirements.txt b/src/tests/unit/requirements.txt
index a03b163..2f1db93 100644
--- a/src/tests/unit/requirements.txt
+++ b/src/tests/unit/requirements.txt
@@ -3,6 +3,7 @@ flake8
 pytest
 pytest-cov
 pytest-mock
+pytest-xdist
 netifaces
 insights-core
 charms.reactive>=1.3.0
diff --git a/src/tests/unit/test_telegraf.py b/src/tests/unit/test_telegraf.py
index 62a5595..39959bf 100644
--- a/src/tests/unit/test_telegraf.py
+++ b/src/tests/unit/test_telegraf.py
@@ -142,10 +142,18 @@ def temp_config_dir(monkeypatch, tmpdir):
     monkeypatch.setattr(telegraf, "SUDOERS_DIR", sudoers_dir.strpath)
 
 
+# For now, too many tests fails if we set also "snap" method
+# TODO: fix all tests so every single one is called once with each install_method
[e-mail](params=["deb"])
+def install_method(request):
+    return request.param
+
+
 @pytest.fixture(autouse=True)
-def config(monkeypatch, temp_charm_dir):
+def config(monkeypatch, temp_charm_dir, install_method):
     raw_config = yaml.full_load(open("config.yaml", "r"))
     data = dict((k, v["default"]) for k, v in raw_config["options"].items())
+    data["install_method"] = install_method
     config = Config(data)
     monkeypatch.setattr(telegraf.hookenv, "config", lambda: config)
 
@@ -190,25 +198,22 @@ def check_sysstat_config(original, expected):
     assert actual == expected
 
 
-def test_write_telegraf_file(mocker, config):
-    config["install_method"] = "deb"
-    write_file = mocker.patch("charmhelpers.core.host.write_file")
-    telegraf.write_telegraf_file("the-path", "the-content áéíóú")
-    write_file.assert_called_once_with(
-        "the-path",
-        "the-content áéíóú".encode("utf-8"),
-        owner="root",
-        group="telegraf",
-        perms=0o640,
-    )
-    config["install_method"] = "snap"
[e-mail]("install_method", ["deb", "snap"])
+def test_write_telegraf_file(mocker, install_method):
+
+    if install_method == "deb":
+        user = telegraf.DEB_USER
+        group = telegraf.DEB_GROUP
+    elif install_method == "snap":
+        user = telegraf.SNAP_USER
+        group = telegraf.SNAP_GROUP
     write_file = mocker.patch("charmhelpers.core.host.write_file")
     telegraf.write_telegraf_file("the-path", "the-content áéíóú")
     write_file.assert_called_once_with(
         "the-path",
         "the-content áéíóú".encode("utf-8"),
-        owner="snap_daemon",
-        group="snap_daemon",
+        owner=user,
+        group=group,
         perms=0o640,
     )
 
@@ -1323,13 +1328,13 @@ def test_inputs_internal_memstats(monkeypatch, config):
     assert expected in config_file.read()
 
 
-class TestGetHostnameLabel(unittest.TestCase):
+class TestGetHostnameLabel():
     @patch("reactive.telegraf.get_remote_unit_name")
     @patch("charmhelpers.core.hookenv.config")
     def test_legacy(self, config, get_remote_unit_name):
         config.return_value = dict(hostname="UNIT_NAME")
         get_remote_unit_name.return_value = "remote/10"
-        self.assertEqual(telegraf.get_hostname_label(), "remote-10")
+        assert telegraf.get_hostname_label() == "remote-10"
 
     @patch("reactive.telegraf.get_remote_unit_name")
     @patch("charmhelpers.core.hookenv.config")
@@ -1338,9 +1343,7 @@ class TestGetHostnameLabel(unittest.TestCase):
         env = dict(JUJU_ENV_NAME="env_name", JUJU_ENV_UUID="env_uuid")
         config.return_value = dict(hostname="{uuid}:{model}:{unit}")
         with patch.dict(os.environ, env):
-            self.assertEqual(
-                telegraf.get_hostname_label(), "env_uuid:env_name:remote-10"
-            )
+            assert telegraf.get_hostname_label() == "env_uuid:env_name:remote-10"
 
     @patch("reactive.telegraf.get_remote_unit_name")
     @patch("charmhelpers.core.hookenv.config")
@@ -1349,12 +1352,10 @@ class TestGetHostnameLabel(unittest.TestCase):
         env = dict(JUJU_MODEL_NAME="model_name", JUJU_MODEL_UUID="model_uuid")
         config.return_value = dict(hostname="{uuid}:{model}:{unit}")
         with patch.dict(os.environ, env):
-            self.assertEqual(
-                telegraf.get_hostname_label(), "model_uuid:model_name:remote-10"
-            )
+            assert telegraf.get_hostname_label() == "model_uuid:model_name:remote-10"
 
 
-class TestTelegrafNagios(unittest.TestCase):
+class TestTelegrafNagios():
     @mock.patch("charmhelpers.contrib.charmsupport.nrpe.NRPE")
     @mock.patch("charmhelpers.contrib.charmsupport.nrpe.get_nagios_hostname")
     def test_update_nrpe_config(self, mock_get_nagios_hostname, mock_nrpe, *args):
@@ -1373,7 +1374,7 @@ class TestTelegrafNagios(unittest.TestCase):
         mock_nrpe.assert_has_calls(calls)
 
 
-class TestGrafanaDashboard(unittest.TestCase):
+class TestGrafanaDashboard():
     @patch("reactive.telegraf.render_custom")
     @patch("reactive.telegraf.endpoint_from_flag")
     @patch("reactive.telegraf.hookenv")
diff --git a/src/tox.ini b/src/tox.ini
index 4977737..ce51462 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -56,7 +56,7 @@ deps =
 
 [testenv:unit]
 commands =
-  pytest -v --ignore {toxinidir}/tests/functional \
+  pytest {posargs:-v -n auto --ignore {toxinidir}/tests/functional \
            --cov=lib \
            --cov=reactive \
            --cov=actions \
@@ -64,7 +64,7 @@ commands =
            --cov=src \
            --cov-report=term \
            --cov-report=annotate:report/annotated \
-           --cov-report=html:report/html
+           --cov-report=html:report/html}
 deps = -r{toxinidir}/tests/unit/requirements.txt
 
 [testenv:func]