From 11f174d251897ef8f2e09dee558052adbf1b1df8 Mon Sep 17 00:00:00 2001 From: Hsin-Yi Chen Date: Fri, 24 Mar 2023 14:29:52 +0800 Subject: Let vts_vndk_files_test show detailed error message Test: atest vts_vndk_files_test Bug: 274928932 Change-Id: Ic45fff6a40ab42da3be56f2bdfe9f5fccc325212 --- files/vts_vndk_files_test.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/files/vts_vndk_files_test.py b/files/vts_vndk_files_test.py index 017ae9c..faa3e6a 100644 --- a/files/vts_vndk_files_test.py +++ b/files/vts_vndk_files_test.py @@ -64,19 +64,21 @@ class VtsVndkFilesTest(unittest.TestCase): return [] return self._dut.FindFiles(dir_path, "*", "!", "-type", "d") - def _Fail(self, unexpected_paths): + def _Fail(self, unexpected_paths, message): """Logs error and fails current test. Args: unexpected_paths: A list of strings, the paths to be shown in the log message. + message: A string, the error message. """ logging.error("Unexpected files:\n%s", "\n".join(unexpected_paths)) assert_lines = unexpected_paths[:20] if len(unexpected_paths) > 20: - assert_lines.append("...") - assert_lines.append( - "Total number of errors: %d" % len(unexpected_paths)) + assert_lines.extend([ + "...", + "Total number of errors: %d" % len(unexpected_paths)]) + assert_lines.append(message) self.fail("\n".join(assert_lines)) def _TestVndkDirectory(self, vndk_dir, vndk_list_names): @@ -95,7 +97,9 @@ class VtsVndkFilesTest(unittest.TestCase): unexpected = [x for x in self._ListFiles(vndk_dir) if target_path_module.basename(x) not in vndk_set] if unexpected: - self._Fail(unexpected) + self._Fail(unexpected, + "The above libraries are not %s." % + ", ".join(vndk_list_names)) def _TestNotInVndkDirecotory(self, vndk_dir, vndk_list_names, except_libs): """Verifies that VNDK directory doesn't contain specific files. @@ -116,7 +120,9 @@ class VtsVndkFilesTest(unittest.TestCase): unexpected = [x for x in self._ListFiles(vndk_dir) if target_path_module.basename(x) in vndk_set] if unexpected: - self._Fail(unexpected) + self._Fail(unexpected, + "%s must not contain %s libraries." % + (vndk_dir, ", ",join(vndk_list_names))) def _TestVndkCoreDirectory(self, bitness): """Verifies that VNDK directory doesn't contain extra files.""" -- cgit v1.2.3