diff options
| author | Hsin-Yi Chen <hsinyichen@google.com> | 2023-03-31 09:07:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-31 09:07:47 +0000 |
| commit | 0755a1755700998e746429dae014a1f1dccfe2b4 (patch) | |
| tree | be1aefb6079b0f12764691a388e0c3f3913a0466 | |
| parent | 59a9acc6ccf3cedbb45e7cae20564ca9ec0611df (diff) | |
| parent | 414f20cbc5ad62c7865577de6b23d9701a08191b (diff) | |
| download | vndk-0755a1755700998e746429dae014a1f1dccfe2b4.tar.gz | |
Merge "Let vts_vndk_files_test show detailed error message" am: 432ffbc679 am: 20e127058a am: 1e7d8738c5 am: 414f20cbc5android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-release
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2506869
Change-Id: I54628cb90de51da35f279991abb8825252d393e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | files/vts_vndk_files_test.py | 18 |
1 files 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.""" |