From 3a56a4cf5ad6185b7d44d5a65ee1c07ae1ef6610 Mon Sep 17 00:00:00 2001
From: buhtz <c.buhtz@posteo.jp>
Date: Sun, 18 Dec 2022 09:43:26 +0100
Subject: [PATCH] Fix: Determine device & filesystem overlayfs

Close #1389
---
 common/test/test_tools.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/common/test/test_tools.py b/common/test/test_tools.py
index 90cdceca2..ad8d47e8d 100644
--- a/common/test/test_tools.py
+++ b/common/test/test_tools.py
@@ -435,15 +435,16 @@ def test_mountArgs(self):
     def test_device(self):
         self.assertEqual(tools.device('/proc'), 'proc')
         self.assertRegex(tools.device('/sys'), r'sys.*')
-        self.assertRegex(tools.device('/nonExistingFolder/foo/bar'),
-                         r'(:?/dev/.*|tmpfs|instances/containers/travis.*)')
+        self.assertRegex(
+            tools.device('/nonExistingFolder/foo/bar'),
+            r'(:?/dev/.*|tmpfs|overlay|instances/containers/travis.*)')
 
     def test_filesystem(self):
         self.assertEqual(tools.filesystem('/proc'), 'proc')
         self.assertRegex(tools.filesystem('/sys'), r'sys.*')
         self.assertRegex(
             tools.filesystem('/nonExistingFolder/foo/bar').lower(),
-            r'(:?ext[2-4]|xfs|zfs|jfs|raiserfs|btrfs|tmpfs|shiftfs)')
+            r'(:?ext[2-4]|xfs|zfs|jfs|raiserfs|btrfs|tmpfs|overlay|shiftfs)')
 
     # tools.uuidFromDev() get called from tools.uuidFromPath because the
     # latter is a synonym/surrogate for too.suuidFromDev()
@@ -479,14 +480,17 @@ def test_uuid_via_filesystem(self, fake_fs):
         # dev-disk folder
         path_dev = pathlib.Path('/dev')
         fake_fs.create_dir(path_dev)
-        
+
         # create disk-files from "sda1" to "sda4" to "sdd4"
-        dev_list = [path_dev / f'sd{letter}{number}' for letter in list('abcd') for number in range(1, 5)]
+        dev_list = [
+            path_dev / f'sd{letter}{number}'
+            for letter in list('abcd')
+            for number in range(1, 5)]
 
         # dev-disk-by-uuid
         path_by_uuid = pathlib.Path('/dev') / 'disk' / 'by-uuid'
         fake_fs.create_dir(path_by_uuid)
-        
+
         # uuids
         uuid_list = [str(uuid.uuid4()) for _ in range(16)]
 
@@ -494,7 +498,7 @@ def test_uuid_via_filesystem(self, fake_fs):
         for idx in range(16):  # 16 devices
             fake_fs.create_symlink(
                 # e.g. /dev/disk/by-uuid/c7aca0
-                file_path=path_by_uuid / uuid_list[idx],  
+                file_path=path_by_uuid / uuid_list[idx],
                 # e.g. /dev/sda1
                 link_target=path_dev / dev_list[idx]
             )