Additional improvements to the ZMQHandler reliability

saltstack · Jun 16, 2021 · e038e0d · e038e0d
1 parent 1e6f4a0
commit e038e0d
Show file tree

Hide file tree

Showing 16 changed files with 423 additions and 186 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -35,7 +35,7 @@ repos:
       - id: pyupgrade
         name: Rewrite Code to be Py3.5+
         args: [--py3-plus]
-        exclude: (^src/saltfactories/utils/salt/.*\.py)
+        exclude: (^src/saltfactories/utils/saltext/.*\.py)
 
   - repo: https://github.com/hakancelik96/unimport
     rev: "31cc123640880e385159c719d2f12b5cf8586495"

diff --git a/.pylint-spelling-words b/.pylint-spelling-words
@@ -63,6 +63,7 @@ globals
 hookspec
 hostname
 https
+hwm
 ico
 ie
 illumos

diff --git a/docs/ref/saltfactories/utils/index.rst b/docs/ref/saltfactories/utils/index.rst
@@ -12,4 +12,4 @@ Utils
    :glob:
 
    *
-   salt/index
+   saltext/index
diff --git a/...ries/utils/salt/engines/pytest_engine.rst → ...s/utils/saltext/engines/pytest_engine.rst b/...ries/utils/salt/engines/pytest_engine.rst → ...s/utils/saltext/engines/pytest_engine.rst
@@ -1,4 +1,4 @@
-.. automodule:: saltfactories.utils.salt.engines.pytest_engine
+.. automodule:: saltfactories.utils.saltext.engines.pytest_engine
    :members:
    :show-inheritance:
    :inherited-members:

diff --git a/docs/ref/saltfactories/utils/salt/index.rst → ...ref/saltfactories/utils/saltext/index.rst b/docs/ref/saltfactories/utils/salt/index.rst → ...ref/saltfactories/utils/saltext/index.rst
@@ -1,4 +1,4 @@
-.. automodule:: saltfactories.utils.salt
+.. automodule:: saltfactories.utils.saltext
    :members:
    :show-inheritance:
    :inherited-members:

diff --git a/.../salt/log_handlers/pytest_log_handler.rst → ...ltext/log_handlers/pytest_log_handler.rst b/.../salt/log_handlers/pytest_log_handler.rst → ...ltext/log_handlers/pytest_log_handler.rst
@@ -1,4 +1,4 @@
-.. automodule:: saltfactories.utils.salt.log_handlers.pytest_log_handler
+.. automodule:: saltfactories.utils.saltext.log_handlers.pytest_log_handler
    :members:
    :show-inheritance:
    :inherited-members:

diff --git a/requirements/tests.txt b/requirements/tests.txt
@@ -1,2 +1,3 @@
 -r base.txt
 docker
+pytest-subtests
diff --git a/src/saltfactories/manager.py b/src/saltfactories/manager.py
@@ -108,14 +108,14 @@ def get_salt_log_handlers_path():
         """
         Returns the path to the Salt log handler this plugin provides
         """
-        return CODE_ROOT_DIR / "utils" / "salt" / "log_handlers"
+        return CODE_ROOT_DIR / "utils" / "saltext" / "log_handlers"
 
     @staticmethod
     def get_salt_engines_path():
         """
         Returns the path to the Salt engine this plugin provides
         """
-        return CODE_ROOT_DIR / "utils" / "salt" / "engines"
+        return CODE_ROOT_DIR / "utils" / "saltext" / "engines"
 
     def final_minion_config_tweaks(self, config):
         pytest_key = "pytest-minion"

diff --git a/src/saltfactories/utils/salt/__init__.py → src/saltfactories/utils/saltext/__init__.py b/src/saltfactories/utils/salt/__init__.py → src/saltfactories/utils/saltext/__init__.py
diff --git a/...ories/utils/salt/engines/pytest_engine.py → ...es/utils/saltext/engines/pytest_engine.py b/...ories/utils/salt/engines/pytest_engine.py → ...es/utils/saltext/engines/pytest_engine.py
diff --git a/src/saltfactories/utils/saltext/log_handlers/__init__.py b/src/saltfactories/utils/saltext/log_handlers/__init__.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,6 +63,7 @@ globals @@
     hookspec
     hostname
     https
+    hwm
     ico
     ie
     illumos
@@ Expand Down @@