mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixing test issue when Linux always returns / for PathGetPathRoot (when its rooted) 

http://typedescriptor.net/browse/members/1247454-Mono.Unix.UnixPath.GetPathRoot%28String%29
This commit is contained in:
Mark McDowall 2013-08-08 21:44:49 -07:00
parent 3559d35d92
commit 6b30d831b3
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NzbDrone.Common/DiskProvider.cs
View File

@ -294,23 +294,23 @@ namespace NzbDrone.Common
{ {
Ensure.That(() => path).IsValidPath(); Ensure.That(() => path).IsValidPath();
var root = GetPathRoot(path);
if (!FolderExists(root))
throw new DirectoryNotFoundException(root);
if (OsInfo.IsLinux) if (OsInfo.IsLinux)
{ {
var driveInfo = DriveInfo.GetDrives().SingleOrDefault(c => c.IsReady && c.Name.Equals(root, StringComparison.CurrentCultureIgnoreCase)); var driveInfo = DriveInfo.GetDrives().SingleOrDefault(c => c.IsReady && path.StartsWith(c.Name, StringComparison.CurrentCultureIgnoreCase));
if (driveInfo == null) if (driveInfo == null)
{ {
return 0; throw new DirectoryNotFoundException(path);
} }
return driveInfo.AvailableFreeSpace; return driveInfo.AvailableFreeSpace;
} }
var root = GetPathRoot(path);
if (!FolderExists(root))
throw new DirectoryNotFoundException(root);
return DriveFreeSpaceEx(root); return DriveFreeSpaceEx(root);
} }

2
NzbDrone.Core.Test/ProviderTests/DiskProviderTests/FreeDiskSpaceTest.cs → NzbDrone.Core.Test/ProviderTests/DiskProviderTests/FreeDiskSpaceFixture.cs
View File

@ -8,7 +8,7 @@ using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.ProviderTests.DiskProviderTests namespace NzbDrone.Core.Test.ProviderTests.DiskProviderTests
{ {
[TestFixture] [TestFixture]
public class FreeDiskSpaceTest : CoreTest<DiskProvider> public class FreeDiskSpaceFixture : CoreTest<DiskProvider>
{ {
[Test] [Test]
public void should_return_free_disk_space() public void should_return_free_disk_space()