Tests: more fixtures.

Common methods from applications/proto.py converted to the fixtures.
sysctl check moved to the specific file where it is using.
Some options moved to the constructor to have early access.

3 files changed, 6 insertions, 35 deletions

diff --git a/test/unit/applications/proto.py b/test/unit/applications/proto.py
index 3f4c13d3..00ea44b2 100644
--- a/test/unit/applications/proto.py
+++ b/test/unit/applications/proto.py
@@ -10,30 +10,6 @@ from unit.option import option
 class TestApplicationProto(TestControl):
     application_type = None
 
-    def sec_epoch(self):
-        return time.mktime(time.gmtime())
-
-    def date_to_sec_epoch(self, date, template='%a, %d %b %Y %X %Z'):
-        return time.mktime(time.strptime(date, template))
-
-    def findall(self, pattern, name='unit.log', flags=re.M):
-        return re.findall(pattern, Log.read(name), flags)
-
-    def search_in_log(self, pattern, name='unit.log', flags=re.M):
-        return re.search(pattern, Log.read(name), flags)
-
-    def wait_for_record(self, pattern, name='unit.log', wait=150, flags=re.M):
-        with Log.open(name) as f:
-            for _ in range(wait):
-                found = re.search(pattern, f.read(), flags)
-
-                if found is not None:
-                    break
-
-                time.sleep(0.1)
-
-        return found
-
     def get_application_type(self):
         current_test = (
             os.environ.get('PYTEST_CURRENT_TEST').split(':')[-1].split(' ')[0]
diff --git a/test/unit/option.py b/test/unit/option.py
index cb3803dc..e00a043a 100644
--- a/test/unit/option.py
+++ b/test/unit/option.py
@@ -1,7 +1,13 @@
+import os
+import platform
+
 class Options:
     _options = {
+        'architecture': platform.architecture()[0],
+        'is_privileged': os.geteuid() == 0,
         'skip_alerts': [],
         'skip_sanitizer': False,
+        'system': platform.system()
     }
 
     def __setattr__(self, name, value):
diff --git a/test/unit/utils.py b/test/unit/utils.py
index 27e7dadc..cd823e27 100644
--- a/test/unit/utils.py
+++ b/test/unit/utils.py
@@ -90,17 +90,6 @@ def findmnt():
     return out
 
 
-def sysctl():
-    try:
-        out = subprocess.check_output(
-            ['sysctl', '-a'], stderr=subprocess.STDOUT
-        ).decode()
-    except FileNotFoundError:
-        pytest.skip('requires sysctl')
-
-    return out
-
-
 def waitformount(template, timeout=50):
     for _ in range(timeout):
         if findmnt().find(template) != -1: