Merge pull request #373 from nichtsfrei/master

Allow running unittests as root
greenbone · Jan 25, 2021 · 62317c8 · 62317c8
2 parents 31534a0 + 2bd4862
commit 62317c8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/tests/test_daemon.py b/tests/test_daemon.py
@@ -359,7 +359,7 @@ def test_sudo_available(self, mock_openvas):
 
         w = DummyDaemon()
         w._sudo_available = None  # pylint: disable=protected-access
-        w.sudo_available  # pylint: disable=pointless-statement
+        w._is_running_as_root = False  # pylint: disable=protected-access
 
         self.assertTrue(w.sudo_available)
 

diff --git a/tests/test_lock.py b/tests/test_lock.py
@@ -21,7 +21,7 @@
 import tempfile
 import fcntl
 
-from pathlib import Path
+from pathlib import Path, PosixPath
 
 from unittest.mock import patch, MagicMock
 from ospd_openvas.lock import LockFile
@@ -36,7 +36,7 @@ def tearDown(self):
         shutil.rmtree(str(self.temp_dir))
 
     def test_acquire_lock(self):
-        lock_file_path = self.temp_dir / 'test.lock'
+        lock_file_path = self.temp_dir / "test.lock"
 
         lock_file = LockFile(lock_file_path)
         lock_file._acquire_lock()
@@ -45,9 +45,9 @@ def test_acquire_lock(self):
         self.assertTrue(lock_file_path.exists())
         lock_file._release_lock()
 
-    @patch('ospd_openvas.lock.logger')
+    @patch("ospd_openvas.lock.logger")
     def test_already_locked(self, mock_logger):
-        lock_file_path = self.temp_dir / 'test.lock'
+        lock_file_path = self.temp_dir / "test.lock"
 
         lock_file_aux = LockFile(lock_file_path)
         lock_file_aux._acquire_lock()
@@ -61,7 +61,7 @@ def test_already_locked(self, mock_logger):
         lock_file_aux._release_lock()
 
     def test_create_parent_dirs(self):
-        lock_file_path = self.temp_dir / 'foo' / 'bar' / 'test.lock'
+        lock_file_path = self.temp_dir / "foo" / "bar" / "test.lock"
 
         lock_file = LockFile(lock_file_path)
         lock_file._acquire_lock()
@@ -74,9 +74,13 @@ def test_create_parent_dirs(self):
 
         lock_file._release_lock()
 
-    @patch('ospd_openvas.lock.logger')
+    @patch("ospd_openvas.lock.logger")
     def test_create_paren_dirs_fail(self, mock_logger):
-        lock_file_path = Path('/root/lock/file/test.lock')
+        lock_file_path = MagicMock(spec=Path).return_value
+        parent = MagicMock(spec=PosixPath)
+        lock_file_path.parent = parent
+        parent.mkdir.side_effect = PermissionError
+
         lock_file = LockFile(lock_file_path)
 
         lock_file._acquire_lock()
@@ -85,7 +89,7 @@ def test_create_paren_dirs_fail(self, mock_logger):
         assert_called_once(mock_logger.error)
 
     def test_context_manager(self):
-        lock_file_path = self.temp_dir / 'test.lock'
+        lock_file_path = self.temp_dir / "test.lock"
 
         lock_file = LockFile(lock_file_path)