Merging upstream version 10.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 3 insertions, 3 deletions

diff --git a/tests/topotests/munet/testing/fixtures.py b/tests/topotests/munet/testing/fixtures.py
index 25039df..3c6d946 100644
--- a/tests/topotests/munet/testing/fixtures.py
+++ b/tests/topotests/munet/testing/fixtures.py
@@ -95,7 +95,7 @@ def _push_log_handler(desc, logpath):
     logging.debug("conftest: adding %s logging at %s", desc, logpath)
     root_logger = logging.getLogger()
     handler = logging.FileHandler(logpath, mode="w")
-    fmt = logging.Formatter("%(asctime)s %(levelname)5s: %(message)s")
+    fmt = logging.Formatter("%(asctime)s %(levelname)5s: %(name)s: %(message)s")
     handler.setFormatter(fmt)
     root_logger.addHandler(handler)
     return handler
diff --git a/tests/topotests/munet/testing/hooks.py b/tests/topotests/munet/testing/hooks.py
index 9b6a49a..985eef9 100644
--- a/tests/topotests/munet/testing/hooks.py
+++ b/tests/topotests/munet/testing/hooks.py
@@ -196,10 +196,10 @@ def pytest_runtest_makereport(item, call):
             if error:
                 item.skip_more_pause = True
 
-            # we can't asyncio.run() (which pause does) if we are unhsare_inline
+            # we can't asyncio.run() (which pause does) if we are not unhsare_inline
             # at this point, count on an autouse fixture to pause instead in this
             # case
-            if not BaseMunet.g_unet or not BaseMunet.g_unet.unshare_inline:
+            if BaseMunet.g_unet and BaseMunet.g_unet.unshare_inline:
                 pause_test(f"before test '{item.nodeid}'")
 
         # check for a result to try and catch setup (or module setup) failure