Prepare rerelease for Checkmk 2.2.0

jiuka · Jun 17, 2023 · 96a0a25 · 96a0a25
1 parent e46524f
commit 96a0a25
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/package b/package
@@ -4,30 +4,30 @@
     'download_url': 'https://github.com/jiuka/checkmk_win_adsync/releases',
     'files': {
         'agent_based': [
-          'win_adsync_scheduler.py',
-          'win_adsync_connector.py',
+            'win_adsync_scheduler.py',
+            'win_adsync_connector.py',
         ],
         'agents': [
-          'bakery/win_adsync.py',
-          'windows/plugins/win_adsync.ps1',
+            'bakery/win_adsync.py',
+            'windows/plugins/win_adsync.ps1',
         ],
         'checkman': [
-          'win_adsync_scheduler',
-          'win_adsync_connector',
+            'win_adsync_scheduler',
+            'win_adsync_connector',
         ],
         'checks': [],
         'doc': [],
         'inventory': [],
         'notifications': [],
         'pnp-templates': [],
         'web': [
-          'plugins/wato/check_parameters_win_adsync.py',
-          'plugins/wato/agent_bakery_win_adsync.py',
+            'plugins/wato/check_parameters_win_adsync.py',
+            'plugins/wato/agent_bakery_win_adsync.py',
         ]},
     'name': 'win_adsync',
     'title': u'Check for Azure AD Connect Sync Service',
-    'version': '2.1',
+    'version': '2.1.1',
     'version.min_required': '2.0.0',
-    'version.packaged': '2.0.0',
-    'version.usable_until': '2.1.0'
+    'version.packaged': '2.2.0',
+    'version.usable_until': '2.3.0'
 }
diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,6 @@
+# pytest.ini
+[pytest]
+filterwarnings =
+    ignore:'crypt' is deprecated:DeprecationWarning
+    ignore:distutils Version classes are deprecated:DeprecationWarning
+    ignore:The asyncore module is deprecated:DeprecationWarning
diff --git a/tests/unit/agent_based/test_win_adsync_connector.py b/tests/unit/agent_based/test_win_adsync_connector.py
@@ -106,7 +106,7 @@ def test_check_win_adsync_connector_tz(timezone, section, result):
     if oldtimezone:
         os.environ['TZ'] = oldtimezone
     else:
-        del(os.environ['TZ'])
+        del os.environ['TZ']
     time.tzset()
 
     assert result in output
diff --git a/tests/unit/agent_based/test_win_adsync_scheduler.py b/tests/unit/agent_based/test_win_adsync_scheduler.py
@@ -233,7 +233,7 @@ def test_check_win_adsync_scheduler_tz(timezone, section, result):
     if oldtimezone:
         os.environ['TZ'] = oldtimezone
     else:
-        del(os.environ['TZ'])
+        del os.environ['TZ']
     time.tzset()
 
     assert result in output
diff --git a/web/plugins/wato/check_parameters_win_adsync.py b/web/plugins/wato/check_parameters_win_adsync.py
@@ -25,7 +25,7 @@
     TextAscii,
     Tuple,
 )
-from cmk.gui.plugins.wato import (
+from cmk.gui.plugins.wato.utils import (
     RulespecGroupCheckParametersApplications,
     CheckParameterRulespecWithItem,
     CheckParameterRulespecWithoutItem,