pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

check operating system for absolute path test

This commit is contained in:
dkanada 2020-01-13 15:34:50 +09:00
parent a8cd963d46
commit 65e9a705d3
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/azure-pipelines.yml
View File

@ -112,7 +112,7 @@ jobs:
- job: main_test
displayName: Main Test
pool:
vmImage: ubuntu-latest
vmImage: windows-latest
steps:
- checkout: self
clean: true

4
Emby.Server.Implementations/IO/ManagedFileSystem.cs
View File

@ -448,7 +448,7 @@ namespace Emby.Server.Implementations.IO
public virtual void SetHidden(string path, bool isHidden)
{
if (OperatingSystem.Id != MediaBrowser.Model.System.OperatingSystemId.Windows)
if (OperatingSystem.Id != OperatingSystemId.Windows)
{
return;
}
@ -779,7 +779,7 @@ namespace Emby.Server.Implementations.IO
public virtual void SetExecutable(string path)
{
if (OperatingSystem.Id == MediaBrowser.Model.System.OperatingSystemId.Darwin)
if (OperatingSystem.Id == OperatingSystemId.Darwin)
{
RunProcess("chmod", "+x \"" + path + "\"", Path.GetDirectoryName(path));
}

13
tests/Jellyfin.Server.Implementations.Tests/IO/ManagedFileSystemTests.cs
View File

@ -1,6 +1,8 @@
using System;
using AutoFixture;
using AutoFixture.AutoMoq;
using Emby.Server.Implementations.IO;
using MediaBrowser.Model.System;
using Xunit;
namespace Jellyfin.Server.Implementations.Tests.IO
@ -26,7 +28,16 @@ namespace Jellyfin.Server.Implementations.Tests.IO
string expectedAbsolutePath)
{
var generatedPath = _sut.MakeAbsolutePath(folderPath, filePath);
Assert.Equal(expectedAbsolutePath, generatedPath);
if (MediaBrowser.Common.System.OperatingSystem.Id == OperatingSystemId.Windows)
{
var windowsPath = "d:" + generatedPath.Replace('/', '\\');
Assert.Equal(expectedAbsolutePath, windowsPath);
}
else
{
Assert.Equal(expectedAbsolutePath, generatedPath);
}
}
}
}