tests: Log as error if some of the daemons are missing

Also print runtime directory for topotests if the error occurs.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/tests/topotests/conftest.py b/tests/topotests/conftest.py
index 120a3e82e4096d714ba70ace75fb3684b66458b4..f79ca71a6482077fdbb3671d4eba2a49f7dc9e66 100755 (executable)
--- a/tests/topotests/conftest.py
+++ b/tests/topotests/conftest.py
@@ -363,7 +363,7 @@ def pytest_configure(config):
 
     # Check environment now that we have config
     if not diagnose_env(rundir):
-        pytest.exit("environment has errors, please read the logs")
+        pytest.exit("environment has errors, please read the logs in %s" % rundir)
 
 
 @pytest.fixture(autouse=True, scope="session")

diff --git a/tests/topotests/lib/topogen.py b/tests/topotests/lib/topogen.py
index c51a187f285900d2ac3c5e2d5103f1e9609b6122..04712eda874065e2ae6d7c72455adf61067b4d08 100644 (file)
--- a/tests/topotests/lib/topogen.py
+++ b/tests/topotests/lib/topogen.py
@@ -1293,7 +1293,7 @@ def diagnose_env_linux(rundir):
                     )
                     continue
 
-                logger.warning("could not find {} in {}".format(fname, frrdir))
+                logger.error("could not find {} in {}".format(fname, frrdir))
                 ret = False
             else:
                 if fname != "zebra":