Alon Bar-Lev has uploaded a new change for review. Change subject: utils: cleanup: ignore File.xxx() return value ......................................................................
utils: cleanup: ignore File.xxx() return value make coverity happy. Change-Id: I294b37963c74148f388db2ea37bcdc542ee47998 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java 2 files changed, 24 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/19242/1 diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarTest.java index 5e53dbd..750b833 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarTest.java @@ -26,7 +26,9 @@ if (f == null) { throw new IOException("File not found " + f); } - f.mkdirs(); + if (!f.mkdirs()) { + // void + } try (OutputStream os = new FileOutputStream(file)) { os.write(content.getBytes("UTF-8")); file.setExecutable(executable); @@ -88,11 +90,19 @@ try { tmpTar = File.createTempFile("test1", "tar"); tmpDir1 = File.createTempFile("test1", "tmp"); - tmpDir1.delete(); - tmpDir1.mkdir(); + if (!tmpDir1.delete()) { + throw new IOException("Cannot delete " + tmpDir1); + } + if (!tmpDir1.mkdir()) { + throw new IOException("Cannot create " + tmpDir1); + } tmpDir2 = File.createTempFile("test1", "tmp"); - tmpDir2.delete(); - tmpDir2.mkdir(); + if (!tmpDir2.delete()) { + throw new IOException("Cannot delete " + tmpDir2); + } + if (!tmpDir2.mkdir()) { + throw new IOException("Cannot create " + tmpDir2); + } _writeFile(new File(tmpDir1, "script1"), "script1", true); _writeFile(new File(tmpDir1, "script2"), "script2", true); @@ -131,7 +141,9 @@ finally { for (File file : new File[] {tmpDir1, tmpDir2, tmpTar}) { if (file != null) { - file.delete(); + if (!file.delete()) { + // void + } } } } diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java index 272a29f..0da2188 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java @@ -74,7 +74,9 @@ @AfterClass public static void cleanUp() { if (local1 != null) { - local1.delete(); + if (!local1.delete()) { + // void + } local1 = null; } TestCommon.terminate(); @@ -109,7 +111,9 @@ client = null; } if (local2 != null) { - local2.delete(); + if (!local2.delete()) { + // void + } local2 = null; } } -- To view, visit http://gerrit.ovirt.org/19242 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I294b37963c74148f388db2ea37bcdc542ee47998 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
