Merge "improve test logging and replace psycopg2 with psycopg2-binary"

placement/tests/functional/fixtures/capture.py

@@ -51,8 +51,6 @@ class Logging(log.ConfigureLogging):
         # If level was not otherwise set, default to INFO.
         if self.level is None:
             self.level = logging.INFO
-        # Always capture logs, unlike the parent.
-        self.capture_logs = True
 
     def setUp(self):
         super(Logging, self).setUp()

test-requirements.txt

@@ -6,7 +6,7 @@ fixtures>=3.0.0 # Apache-2.0/BSD
 # psycopg2 and PYMySQL. You can workaround them using sys_platform qualifier.
 # See the https://review.opendev.org/#/c/671249/ for details. However, we
 # don't use it here to keep the consistency with global requirements.
-psycopg2>=2.8 # LGPL/ZPL
+psycopg2-binary>=2.8 # LGPL/ZPL
 PyMySQL>=0.8.0 # MIT License
 oslotest>=3.5.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0

tox.ini

@@ -15,6 +15,7 @@ setenv =
   LC_ALL=en_US.utf-8
   OS_STDOUT_CAPTURE=1
   OS_STDERR_CAPTURE=1
+  OS_LOG_CAPTURE = {env:OS_LOG_CAPTURE:1}
   OS_TEST_TIMEOUT=160
   PYTHONDONTWRITEBYTECODE=1
 deps = -r{toxinidir}/test-requirements.txt
@@ -22,6 +23,7 @@ deps = -r{toxinidir}/test-requirements.txt
 commands =
   stestr run {posargs}
 passenv =
+  OS_LOG_CAPTURE
   OS_DEBUG
   GENERATE_HASHES
 # there is also secret magic in subunit-trace which lets you run in a fail only