Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-04 11:49:53 +02:00
Code Issues Packages Projects Releases Activity

No exception for missing file on cancelled installation

Browse Source
This commit is contained in:
René Pfeuffer
2020-11-24 18:18:50 +01:00
parent b67a0cb89d
commit fc9176ec5a
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scm-webapp/src/main/java/sonia/scm/plugin/PendingPluginInstallation.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.plugin;
import org.slf4j.Logger;
@@ -50,10 +50,14 @@ class PendingPluginInstallation {
void cancel() {
String name = plugin.getDescriptor().getInformation().getName();
LOG.info("cancel installation of plugin {}", name);
try {
Files.delete(file);
} catch (IOException ex) {
throw new PluginFailedToCancelInstallationException("failed to cancel plugin installation ", name, ex);
if (Files.exists(file)) {
try {
Files.delete(file);
} catch (IOException ex) {
throw new PluginFailedToCancelInstallationException("failed to cancel plugin installation ", name, ex);
}
} else {
LOG.info("plugin file {} did not exists for plugin {}; nothing deleted", file, name);
}
}
}

7
scm-webapp/src/test/java/sonia/scm/plugin/PendingPluginInstallationTest.java
View File

@@ -59,8 +59,13 @@ class PendingPluginInstallationTest {
}
@Test
void shouldThrowExceptionIfCancelFailed(@TempDir Path directory) {
void shouldThrowExceptionIfCancelFailed(@TempDir Path directory) throws IOException {
Path file = directory.resolve("file");
Files.createDirectory(file);
Path makeFileNotDeletable = file.resolve("not_deletable");
Files.write(makeFileNotDeletable, "42".getBytes());
when(plugin.getDescriptor().getInformation().getName()).thenReturn("scm-awesome-plugin");
PendingPluginInstallation installation = new PendingPluginInstallation(plugin, file);