[18/39] tests/functional: avoid accessing log_filename on earlier failures

Commit Message

Alex Bennée Nov. 21, 2024, 4:57 p.m. UTC

From: Daniel P. Berrangé <[e-mail]>

If a failure occurs early in the QemuBaseTest constructor, the
'log_filename' object atttribute may not exist yet. This happens
most notably if the QEMU_TEST_QEMU_BINARY is not set. We can't
initialize 'log_filename' earlier as we use the binary to identify
the architecture which is then used to build the path in which the
logs are stored.

Signed-off-by: Daniel P. Berrangé <[e-mail]>
Message-Id: <[e-mail]>
Signed-off-by: Alex Bennée <[e-mail]>
---
 tests/functional/qemu_test/testcase.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Comments

Thomas Huth Nov. 22, 2024, 10:19 a.m. UTC | #1

On 21/11/2024 17.57, Alex Bennée wrote:
> From: Daniel P. Berrangé <[e-mail]>
> 
> If a failure occurs early in the QemuBaseTest constructor, the
> 'log_filename' object atttribute may not exist yet. This happens

s/atttribute/attribute/

> most notably if the QEMU_TEST_QEMU_BINARY is not set. We can't
> initialize 'log_filename' earlier as we use the binary to identify
> the architecture which is then used to build the path in which the
> logs are stored.

With the typo fixed:
Reviewed-by: Thomas Huth <[e-mail]>

Patch

diff --git a/tests/functional/qemu_test/testcase.py b/tests/functional/qemu_test/testcase.py
index fceafb32b0..90ae59eb54 100644
--- a/tests/functional/qemu_test/testcase.py
+++ b/tests/functional/qemu_test/testcase.py
@@ -81,10 +81,12 @@  def main():
         res = unittest.main(module = None, testRunner = tr, exit = False,
                             argv=["__dummy__", path])
         for (test, message) in res.result.errors + res.result.failures:
-            print('More information on ' + test.id() + ' could be found here:'
-                  '\n %s' % test.log_filename, file=sys.stderr)
-            if hasattr(test, 'console_log_name'):
-                print(' %s' % test.console_log_name, file=sys.stderr)
+
+            if hasattr(test, "log_filename"):
+                print('More information on ' + test.id() + ' could be found here:'
+                      '\n %s' % test.log_filename, file=sys.stderr)
+                if hasattr(test, 'console_log_name'):
+                    print(' %s' % test.console_log_name, file=sys.stderr)
         sys.exit(not res.result.wasSuccessful())