From 5af12b67be147711e0d9129de27824ea9a983b79 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Tue, 21 Jul 2015 21:26:15 +0200 Subject: [PATCH] Revert "Fixed: Disabled transactional file transfers since we don't want that feature in master yet." This reverts commit ada5919136bd292cb8cc2f93b28b4b5404171928. --- .../DiskTests/DiskTransferServiceFixture.cs | 16 ---------------- src/NzbDrone.Common/Disk/DiskTransferService.cs | 3 --- 2 files changed, 19 deletions(-) diff --git a/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs b/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs index b7e7f4fce..669449e44 100644 --- a/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs +++ b/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs @@ -30,21 +30,6 @@ namespace NzbDrone.Common.Test.DiskTests } [Test] - public void should_not_use_verified_transfer() - { - Subject.VerificationMode.Should().Be(DiskTransferVerificationMode.VerifyOnly); - - var result = Subject.TransferFile(_sourcePath, _targetPath, TransferMode.Move); - - Mocker.GetMock() - .Verify(v => v.TryCreateHardLink(_sourcePath, _backupPath), Times.Never()); - - Mocker.GetMock() - .Verify(v => v.MoveFile(_sourcePath, _targetPath, false), Times.Once()); - } - - [Test] - [Ignore("Disabled verified transfer temporarily.")] public void should_use_verified_transfer_on_mono() { MonoOnly(); @@ -53,7 +38,6 @@ namespace NzbDrone.Common.Test.DiskTests } [Test] - [Ignore("Disabled verified transfer temporarily.")] public void should_not_use_verified_transfer_on_windows() { WindowsOnly(); diff --git a/src/NzbDrone.Common/Disk/DiskTransferService.cs b/src/NzbDrone.Common/Disk/DiskTransferService.cs index 74a1d5f25..80647d61f 100644 --- a/src/NzbDrone.Common/Disk/DiskTransferService.cs +++ b/src/NzbDrone.Common/Disk/DiskTransferService.cs @@ -41,9 +41,6 @@ namespace NzbDrone.Common.Disk // TODO: Atm we haven't seen partial transfers on windows so we disable verified transfer. // (If enabled in the future, be sure to check specifically for ReFS, which doesn't support hardlinks.) VerificationMode = OsInfo.IsWindows ? DiskTransferVerificationMode.VerifyOnly : DiskTransferVerificationMode.Transactional; - - // TODO: Disabled the transactional logic entirely coz we have a couple of potential issues which we don't want in master. - VerificationMode = DiskTransferVerificationMode.VerifyOnly; } public TransferMode TransferFolder(String sourcePath, String targetPath, TransferMode mode, bool verified = true)