Increase timeouts and log test timestamps (#792)

* Configure pytest to log timestamps

We'll configure pytest to use log timestamps, which allows us to
correlate test logs with kubernetes logs.

* Bump test timeouts again

We're waiting about 5 minutes for new nodes to become ready, however
sometimes this isn't enough. It can take around one minute just to
pull the cilium image.

For this reason, we'll double the test timeouts again.

tests/branch_management/tox.ini

@@ -38,6 +38,8 @@ commands =
         --tb native \
         --log-cli-level DEBUG \
         --disable-warnings \
+        --log-format "%(asctime)s %(levelname)s %(message)s" \
+        --log-date-format "%Y-%m-%d %H:%M:%S" \
         {posargs} \
         {tox_root}/tests
 pass_env =

tests/integration/tests/test_util/config.py

@@ -7,7 +7,7 @@
 DIR = Path(__file__).absolute().parent
 
 # The following defaults are used to define how long to wait for a condition to be met.
-DEFAULT_WAIT_RETRIES = int(os.getenv("TEST_DEFAULT_WAIT_RETRIES") or 60)
+DEFAULT_WAIT_RETRIES = int(os.getenv("TEST_DEFAULT_WAIT_RETRIES") or 120)
 DEFAULT_WAIT_DELAY_S = int(os.getenv("TEST_DEFAULT_WAIT_DELAY_S") or 5)
 
 MANIFESTS_DIR = DIR / ".." / ".." / "templates"

tests/integration/tox.ini

@@ -37,6 +37,8 @@ commands =
         --maxfail 1 \
         --tb native \
         --log-cli-level DEBUG \
+        --log-format "%(asctime)s %(levelname)s %(message)s" \
+        --log-date-format "%Y-%m-%d %H:%M:%S" \
         --disable-warnings \
         {posargs} \
         {toxinidir}/tests