Merge ~levanquach/checkbox-ng:oniro_patch into checkbox-ng:master

[Le Van Quach]

Modify jinja2.py and restart.py files in order to integrate checkbox in Oniro

Changes in jinja2.py file are related to deprecated functionalities.

Checkbox restart strategy is modified in order to work also when checkbox is run as a service.

Unmerged commits

e6a0005... by Le Van Quach on 2022-08-30

Manage autoescape extension according to jinja2 installed version

6a3cd3b... by Le Van Quach on 2022-08-30

Adjust for deprecated jinja2 markup, environment filter and escape alias

e9b88d9... by Le Van Quach on 2022-08-30

Add new checkbox restart strategy

diff --git a/plainbox/impl/exporter/jinja2.py b/plainbox/impl/exporter/jinja2.py
index 1f780e4..abdba4c 100644
--- a/plainbox/impl/exporter/jinja2.py
+++ b/plainbox/impl/exporter/jinja2.py
@@ -27,14 +27,15 @@
 
 import json
 import re
+import jinja2
 from collections import OrderedDict
 from datetime import datetime
+from packaging import version
 
 from jinja2 import Environment
 from jinja2 import FileSystemLoader
-from jinja2 import Markup
-from jinja2 import environmentfilter
-from jinja2 import escape
+from jinja2 import pass_environment
+from markupsafe import escape, Markup
 
 from plainbox import get_version_string
 from plainbox.abc import ISessionStateExporter
@@ -47,7 +48,7 @@ from plainbox.impl.unit.exporter import ExporterError
 CERTIFICATION_NS = 'com.canonical.certification::'
 
 
-@environmentfilter
+@pass_environment
 def do_strip_ns(_environment, unit_id, ns=CERTIFICATION_NS):
     """Remove the namespace part of the identifier."""
     # com.my.namespace::category/job-id → category/job-id
@@ -111,7 +112,13 @@ class Jinja2SessionStateExporter(SessionStateExporterBase):
         self.option_list = tuple(exporter_unit.option_list or ()) + tuple(
                 option_list or ())
         loader = FileSystemLoader(paths)
-        env = Environment(loader=loader, extensions=['jinja2.ext.autoescape'])
+        # For jinja2 version > 2.9.0 autoescape functionality is built-in,
+        # no need to add extensions
+        if version.parse(jinja2.__version__) >= version.parse('2.9.0'):
+            env = Environment(loader=loader)
+        else:
+            env = Environment(loader=loader, extensions=['jinja2.ext.autoescape'])
+
         self.customize_environment(env)
 
         def include_file(name):
diff --git a/plainbox/impl/session/restart.py b/plainbox/impl/session/restart.py
index 0aa67b4..d7f95b4 100644
--- a/plainbox/impl/session/restart.py
+++ b/plainbox/impl/session/restart.py
@@ -276,13 +276,8 @@ def detect_restart_strategy(session=None, session_type=None) -> IRestartStrategy
     # with the next release or when we do inclusive naming refactor
     # or roughly after April of 2022
     if session_type in ('remote', 'checkbox-slave'):
-        try:
-            subprocess.run(
-                ['systemctl', 'is-active', '--quiet', 'checkbox-ng.service'],
-                check=True)
+        if check_service_is_active():
             return RemoteDebRestartStrategy()
-        except subprocess.CalledProcessError:
-                pass
 
     # XXX: RemoteSnappyRestartStrategy debug
     remote_restart_stragegy_debug = os.getenv('REMOTE_RESTART_DEBUG')
@@ -337,8 +332,21 @@ def detect_restart_strategy(session=None, session_type=None) -> IRestartStrategy
         # NOTE: Assume this is a terminal application
         return XDGRestartStrategy(app_terminal=True)
 
+    # Systemctl
+    if session_type == None:
+        if check_service_is_active():
+            return RemoteDebRestartStrategy()
+
     raise LookupError("Unable to find appropriate strategy.""")
 
+def check_service_is_active() -> bool:
+    try:
+        subprocess.run(
+            ['systemctl', 'is-active', '--quiet', 'checkbox-ng.service'],
+            check=True)
+        return True
+    except subprocess.CalledProcessError:
+        return False
 
 def get_strategy_by_name(name: str) -> type:
     """