Merge ~peter-sabaini/charm-sudo-pair:fix-tmpfiles into ~sudo-pair-charmers/charm-sudo-pair:master

[Peter Sabaini]

[Drew Freiberger (afreiberger)]

I've run unit tests with my suggestion on testing the content below. Content fine as is, but would recommend the additional test.

Thanks for the commit!

review: Approve

[Peter Sabaini (peter-sabaini)]

LOL, indeed I meant to really compare something in the test. Thanks for the catch -- please take a look?

On 13.01.20 19:29, Drew Freiberger wrote:
> Review: Approve
>
> I've run unit tests with my suggestion on testing the content below. Content fine as is, but would recommend the additional test.
>
> Thanks for the commit!
>
> Diff comments:
>
>> diff --git a/tests/unit/test_libsudopair.py b/tests/unit/test_libsudopair.py
>> index ecd1e41..d983900 100644
>> --- a/tests/unit/test_libsudopair.py
>> +++ b/tests/unit/test_libsudopair.py
>> @@ -147,6 +147,13 @@ class TestSudoPairHelper():
>> sph.create_socket_dir()
>> assert os.path.exists(tmpdir.join('/var/run/sudo_pair'))
>>
>> + def test_create_tmpfiles_conf(self, sph, tmpdir):
>> + sph.create_tmpfiles_conf()
>> + expected_content = ''
>
> I'd really like to see this check some amount of the content of the return to make sure the function is still able to be properly mocked out with the read/write.
>
> expected_content = "d {} 0755 - - -\n".format(sph.socket_dir)
>
>> + with open(tmpdir.join('/usr/lib/tmpfiles.d/sudo_pair.conf')) as f:
>> + content = f.read()
>> + assert expected_content in content
>
> assert expected_content == content
>
>> +
>> def test_install_sudo_pair_so(self, sph, tmpdir):
>> sph.install_sudo_pair_so()
>> assert filecmp.cmp('./files/sudo_pair.so', tmpdir.join('/usr/lib/sudo/sudo_pair.so'))
>
>

[Drew Freiberger (afreiberger)]

+1 lgtm

review: Approve

[Jeremy Lounder (jldev)]

review: Approve

diff --git a/lib/libsudopair.py b/lib/libsudopair.py
index 3422521..d3b96a7 100644
--- a/lib/libsudopair.py
+++ b/lib/libsudopair.py
@@ -47,6 +47,7 @@ class SudoPairHelper(object):
         self.user_prompt_path = '/etc/sudo_pair.prompt.user'
         self.pair_prompt_path = '/etc/sudo_pair.prompt.pair'
         self.socket_dir = '/var/run/sudo_pair'
+        self.tmpfiles_conf = '/usr/lib/tmpfiles.d/sudo_pair.conf'
         self.owner = 'root'
         self.group = 'root'
         self.socket_dir_perms = 0o644
@@ -79,6 +80,10 @@ class SudoPairHelper(object):
     def create_socket_dir(self):
         host.mkdir(self.socket_dir, perms=self.socket_dir_perms, owner=self.owner, group=self.group)
 
+    def create_tmpfiles_conf(self):
+        with open(self.tmpfiles_conf, "w") as f:
+            f.write("d {} 0755 - - -\n".format(self.socket_dir))
+
     def install_sudo_pair_so(self):
         sudo_pair_lib = os.path.join(hookenv.charm_dir(), 'files', 'sudo_pair.so')
         copy_file(sudo_pair_lib, self.sudo_lib_path, self.owner, self.group, self.sudo_pair_so_perms)
diff --git a/reactive/sudo_pair.py b/reactive/sudo_pair.py
index 13db3d9..be557f8 100644
--- a/reactive/sudo_pair.py
+++ b/reactive/sudo_pair.py
@@ -15,6 +15,8 @@ def install_sudo_pair():
 
     sph.create_socket_dir()
 
+    sph.create_tmpfiles_conf()
+
     sph.copy_user_prompt()
 
     sph.copy_pair_prompt()
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
index 38db222..0e2c034 100644
--- a/tests/unit/conftest.py
+++ b/tests/unit/conftest.py
@@ -4,6 +4,7 @@ import pytest
 import pwd
 import grp
 import os
+from pathlib import Path
 
 
 @pytest.fixture
@@ -36,6 +37,9 @@ def sph(mock_hookenv_config, mock_charm_dir, tmpdir):
     sph.group = grp.getgrgid(os.getgid()).gr_name
     sph.sudo_conf_path = tmpdir.join(sph.sudo_conf_path)
     sph.socket_dir = tmpdir.join(sph.socket_dir)
+    td = Path(tmpdir.join(sph.tmpfiles_conf).strpath).parent
+    td.mkdir(parents=True, exist_ok=True, mode=0o755)
+    sph.tmpfiles_conf = tmpdir.join(sph.tmpfiles_conf)
     sph.sudo_lib_path = tmpdir.join(sph.sudo_lib_path)
     sph.user_prompt_path = tmpdir.join(sph.user_prompt_path)
     sph.pair_prompt_path = tmpdir.join(sph.pair_prompt_path)
diff --git a/tests/unit/test_libsudopair.py b/tests/unit/test_libsudopair.py
index ecd1e41..fea4985 100644
--- a/tests/unit/test_libsudopair.py
+++ b/tests/unit/test_libsudopair.py
@@ -147,6 +147,13 @@ class TestSudoPairHelper():
         sph.create_socket_dir()
         assert os.path.exists(tmpdir.join('/var/run/sudo_pair'))
 
+    def test_create_tmpfiles_conf(self, sph, tmpdir):
+        sph.create_tmpfiles_conf()
+        expected_content = 'd {} 0755 - - -\n'.format(sph.socket_dir)
+        with open(tmpdir.join('/usr/lib/tmpfiles.d/sudo_pair.conf')) as f:
+            content = f.read()
+        assert expected_content in content
+
     def test_install_sudo_pair_so(self, sph, tmpdir):
         sph.install_sudo_pair_so()
         assert filecmp.cmp('./files/sudo_pair.so', tmpdir.join('/usr/lib/sudo/sudo_pair.so'))