Skip to content

Add category for extra tests to run in PRs #1046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kewillford merged 2 commits into from
Apr 18, 2019
Merged

Add category for extra tests to run in PRs #1046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b942840
Change full suite to extra coverage with option to only run the extra…
Apr 17, 2019
044f971
Add dependency for fastfetch on the GVFS.FunctionalTests.Windows
Apr 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions GVFS.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.Hooks.Windows", "GVFS\
{A4984251-840E-4622-AD0C-66DFCE2B2574} = {A4984251-840E-4622-AD0C-66DFCE2B2574}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.Service", "GVFS\GVFS.Service\GVFS.Service.Windows.csproj", "{B8C1DFBA-CAFD-4F7E-A1A3-E11907B5467B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.Service.Windows", "GVFS\GVFS.Service\GVFS.Service.Windows.csproj", "{B8C1DFBA-CAFD-4F7E-A1A3-E11907B5467B}"
ProjectSection(ProjectDependencies) = postProject
{2D23AB54-541F-4ABC-8DCA-08C199E97ABB} = {2D23AB54-541F-4ABC-8DCA-08C199E97ABB}
{5A6656D5-81C7-472C-9DC8-32D071CB2258} = {5A6656D5-81C7-472C-9DC8-32D071CB2258}
{BDA91EE5-C684-4FC5-A90A-B7D677421917} = {BDA91EE5-C684-4FC5-A90A-B7D677421917}
{24D161E9-D1F0-4299-BBD3-5D940BEDD535} = {24D161E9-D1F0-4299-BBD3-5D940BEDD535}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.Service.Mac", "GVFS\GVFS.Service\GVFS.Service.Mac.csproj", "{03769A07-F216-456B-886B-E07CAF6C5E81}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.Service.Mac", "GVFS\GVFS.Service\GVFS.Service.Mac.csproj", "{03769A07-F216-456B-886B-E07CAF6C5E81}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GVFS.ReadObjectHook.Windows", "GVFS\GVFS.ReadObjectHook\GVFS.ReadObjectHook.Windows.vcxproj", "{5A6656D5-81C7-472C-9DC8-32D071CB2258}"
ProjectSection(ProjectDependencies) = postProject
Expand Down Expand Up @@ -94,6 +94,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.Installer.Windows", "G
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.Installer.Mac", "GVFS\GVFS.Installer.Mac\GVFS.Installer.Mac.csproj", "{25229A04-6554-49B1-A95A-3F3B76C5B0C8}"
ProjectSection(ProjectDependencies) = postProject
{03769A07-F216-456B-886B-E07CAF6C5E81} = {03769A07-F216-456B-886B-E07CAF6C5E81}
{4CC2A90D-D240-4382-B4BF-5E175515E492} = {4CC2A90D-D240-4382-B4BF-5E175515E492}
{28939122-7263-41E7-A7E2-CBFB01AD6A04} = {28939122-7263-41E7-A7E2-CBFB01AD6A04}
{A4984251-840E-4622-AD0C-66DFCE2B2574} = {A4984251-840E-4622-AD0C-66DFCE2B2574}
Expand All @@ -102,7 +103,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.Installer.Mac", "GVFS\
{FAC6EFC5-A890-4CB2-8C80-6358E358C637} = {FAC6EFC5-A890-4CB2-8C80-6358E358C637}
{374BF1E5-0B2D-4D4A-BD5E-4212299DEF09} = {374BF1E5-0B2D-4D4A-BD5E-4212299DEF09}
{35CA4DFB-1320-4055-B8F6-F12E0F252FF0} = {35CA4DFB-1320-4055-B8F6-F12E0F252FF0}
{03769A07-F216-456B-886B-E07CAF6C5E81} = {03769A07-F216-456B-886B-E07CAF6C5E81}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.SignFiles", "GVFS\GVFS.SignFiles\GVFS.SignFiles.csproj", "{2F63B22B-EE26-4266-BF17-28A9146483A1}"
Expand Down Expand Up @@ -164,6 +164,7 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.FunctionalTests.Windows", "GVFS\GVFS.FunctionalTests.Windows\GVFS.FunctionalTests.Windows.csproj", "{0F0A008E-AB12-40EC-A671-37A541B08C7F}"
ProjectSection(ProjectDependencies) = postProject
{17498502-AEFF-4E70-90CC-1D0B56A8ADF5} = {17498502-AEFF-4E70-90CC-1D0B56A8ADF5}
{07F2A520-2AB7-46DD-97C0-75D8E988D55B} = {07F2A520-2AB7-46DD-97C0-75D8E988D55B}
{3771C555-B5C1-45E2-B8B7-2CEF1619CDC5} = {3771C555-B5C1-45E2-B8B7-2CEF1619CDC5}
{FA273F69-5762-43D8-AEA1-B4F08090D624} = {FA273F69-5762-43D8-AEA1-B4F08090D624}
{B8C1DFBA-CAFD-4F7E-A1A3-E11907B5467B} = {B8C1DFBA-CAFD-4F7E-A1A3-E11907B5467B}
Expand All @@ -183,7 +184,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.FunctionalTests", "GVF
{35CA4DFB-1320-4055-B8F6-F12E0F252FF0} = {35CA4DFB-1320-4055-B8F6-F12E0F252FF0}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.FunctionalTests.LockHolder", "GVFS\GVFS.FunctionalTests.LockHolder\GVFS.FunctionalTests.LockHolder.csproj", "{FA273F69-5762-43D8-AEA1-B4F08090D624}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.FunctionalTests.LockHolder", "GVFS\GVFS.FunctionalTests.LockHolder\GVFS.FunctionalTests.LockHolder.csproj", "{FA273F69-5762-43D8-AEA1-B4F08090D624}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.Hooks.Mac", "GVFS\GVFS.Hooks\GVFS.Hooks.Mac.csproj", "{4CC2A90D-D240-4382-B4BF-5E175515E492}"
ProjectSection(ProjectDependencies) = postProject
Expand Down Expand Up @@ -447,8 +448,8 @@ Global
{8E0D0989-21F6-4DD8-946C-39F992523CC6} = {C41F10F9-1163-4CFA-A465-EA728F75E9FA}
{3771C555-B5C1-45E2-B8B7-2CEF1619CDC5} = {C41F10F9-1163-4CFA-A465-EA728F75E9FA}
{BDA91EE5-C684-4FC5-A90A-B7D677421917} = {2EF2EC94-3A68-4ED7-9A58-B7057ADBA01C}
{03769A07-F216-456B-886B-E07CAF6C5E81} = {2EF2EC94-3A68-4ED7-9A58-B7057ADBA01C}
{B8C1DFBA-CAFD-4F7E-A1A3-E11907B5467B} = {2EF2EC94-3A68-4ED7-9A58-B7057ADBA01C}
{03769A07-F216-456B-886B-E07CAF6C5E81} = {2EF2EC94-3A68-4ED7-9A58-B7057ADBA01C}
{5A6656D5-81C7-472C-9DC8-32D071CB2258} = {2EF2EC94-3A68-4ED7-9A58-B7057ADBA01C}
{28674A4B-1223-4633-A460-C8CC39B09318} = {DCE11095-DA5F-4878-B58D-2702765560F5}
{C5D3CA26-562F-4CA4-A378-B93E97A730E3} = {C41F10F9-1163-4CFA-A465-EA728F75E9FA}
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests.Windows/Windows/Tests/DiskLayoutUpgradeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace GVFS.FunctionalTests.Windows.Tests
{
[TestFixture]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
[Category(Categories.WindowsOnly)]
public class DiskLayoutUpgradeTests : TestsWithEnlistmentPerTestCase
{
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests.Windows/Windows/Tests/JunctionAndSubstTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
namespace GVFS.FunctionalTests.Windows.Tests
{
[TestFixture]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
[Category(Categories.WindowsOnly)]
public class JunctionAndSubstTests : TestsWithEnlistmentPerFixture
{
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests.Windows/Windows/Tests/ServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace GVFS.FunctionalTests.Windows.Tests
{
[TestFixture]
[NonParallelizable]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
[Category(Categories.WindowsOnly)]
public class ServiceTests : TestsWithEnlistmentPerFixture
{
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests.Windows/Windows/Tests/SharedCacheUpgradeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace GVFS.FunctionalTests.Windows.Windows.Tests
{
[TestFixture]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
[Category(Categories.WindowsOnly)]
public class SharedCacheUpgradeTests : TestsWithMultiEnlistment
{
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Categories.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
public static class Categories
{
public const string FullSuiteOnly = "FullSuiteOnly";
public const string ExtraCoverage = "ExtraCoverage";
public const string FastFetch = "FastFetch";
public const string GitCommands = "GitCommands";

Expand Down
21 changes: 17 additions & 4 deletions GVFS/GVFS.FunctionalTests/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ public static void Main(string[] args)

GVFSTestConfig.LocalCacheRoot = runner.GetCustomArgWithParam("--shared-gvfs-cache-root");

List<string> includeCategories = new List<string>();
List<string> excludeCategories = new List<string>();
HashSet<string> includeCategories = new HashSet<string>();
HashSet<string> excludeCategories = new HashSet<string>();

if (runner.HasCustomArg("--full-suite"))
{
Expand All @@ -60,15 +60,28 @@ public static void Main(string[] args)
new object[]
{
new object[] { true }
};
};

if (runner.HasCustomArg("--extra-only"))
{
Console.WriteLine("Running only the tests marked as ExtraCoverage");
includeCategories.Add(Categories.ExtraCoverage);
}
else
{
excludeCategories.Add(Categories.ExtraCoverage);
}

excludeCategories.Add(Categories.FullSuiteOnly);
GVFSTestConfig.FileSystemRunners = FileSystemRunners.FileSystemRunner.DefaultRunners;
}

if (runner.HasCustomArg("--windows-only"))
{
includeCategories.Add(Categories.WindowsOnly);

// RunTests unions all includeCategories. Remove ExtraCoverage to
// ensure that we only run tests flagged as WindowsOnly
includeCategories.Remove(Categories.ExtraCoverage);
}

if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tests/DiskLayoutVersionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
namespace GVFS.FunctionalTests.Tests
{
[TestFixture]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
public class DiskLayoutVersionTests : TestsWithEnlistmentPerTestCase
{
private const int WindowsCurrentDiskLayoutMajorVersion = 17;
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/CacheServerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
{
[TestFixture]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
public class CacheServerTests : TestsWithEnlistmentPerFixture
{
private const string CustomUrl = "https://myCache";
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/DehydrateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
{
[TestFixture]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
[Category(Categories.MacTODO.M4)]
public class DehydrateTests : TestsWithEnlistmentPerFixture
{
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/DiagnoseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
{
[TestFixture]
[NonParallelizable]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
public class DiagnoseTests : TestsWithEnlistmentPerFixture
{
private FileSystemRunner fileSystem;
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/GVFSUpgradeReminderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
{
[TestFixture]
[NonParallelizable]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
[Category(Categories.WindowsOnly)]
public class UpgradeReminderTests : TestsWithEnlistmentPerFixture
{
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/MountTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
{
[TestFixture]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
public class MountTests : TestsWithEnlistmentPerFixture
{
private const int GVFSGenericError = 3;
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/ParallelHydrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public ParallelHydrationTests(FileSystemRunner fileSystem)
}

[TestCase]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
public void HydrateRepoInParallel()
{
GitProcess.Invoke(this.Enlistment.RepoRoot, $"checkout -f {FileConstants.CommitId}");
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/PrefetchVerbWithoutSharedCacheTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
// TODO(Mac): Before these tests can be enabled PostFetchJobShouldComplete needs
// to work on Mac (where post-fetch.lock is not removed from disk)
[TestFixture]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
[Category(Categories.MacTODO.M4)]
public class PrefetchVerbWithoutSharedCacheTests : TestsWithEnlistmentPerFixture
{
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/UnmountTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
{
[TestFixture]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
public class UnmountTests : TestsWithEnlistmentPerFixture
{
private FileSystemRunner fileSystem;
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerTestCase/PersistedWorkingDirectoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace GVFS.FunctionalTests.Tests.EnlistmentPerTestCase
{
[TestFixture]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
public class PersistedWorkingDirectoryTests : TestsWithEnlistmentPerTestCase
{
[TestCaseSource(typeof(FileSystemRunner), nameof(FileSystemRunner.Runners))]
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerTestCase/RepairTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
namespace GVFS.FunctionalTests.Tests.EnlistmentPerTestCase
{
[TestFixture]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
[Category(Categories.MacTODO.M4)]
public class RepairTests : TestsWithEnlistmentPerTestCase
{
Expand Down
4 changes: 2 additions & 2 deletions GVFS/GVFS.FunctionalTests/Tests/FastFetchTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace GVFS.FunctionalTests.Tests
{
[TestFixture]
[Category(Categories.FastFetch)]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
public class FastFetchTests
{
private const string LsTreeTypeInPathBranchName = "FunctionalTests/20181105_LsTreeTypeInPath";
Expand Down Expand Up @@ -501,7 +501,7 @@ private ProcessResult RunFastFetch(string args)
fastfetch = Path.Combine(Settings.Default.CurrentDirectory, "fastfetch.dll");
}

File.Exists(fastfetch).ShouldBeTrue();
File.Exists(fastfetch).ShouldBeTrue($"{fastfetch} did not exist.");
Console.WriteLine($"Using {fastfetch}");

ProcessStartInfo processInfo = new ProcessStartInfo("dotnet");
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tests/MultiEnlistmentTests/ConfigVerbTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
namespace GVFS.FunctionalTests.Tests.MultiEnlistmentTests
{
[TestFixture]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
[Category(Categories.MacTODO.M4)]
public class ConfigVerbTests : TestsWithMultiEnlistment
{
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tests/MultiEnlistmentTests/ServiceVerbTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace GVFS.FunctionalTests.Tests.MultiEnlistmentTests
{
[TestFixture]
[NonParallelizable]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
[Category(Categories.MacTODO.M4)]
public class ServiceVerbTests : TestsWithMultiEnlistment
{
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
namespace GVFS.FunctionalTests.Tests.MultiEnlistmentTests
{
[TestFixture]
[Category(Categories.FullSuiteOnly)]
[Category(Categories.ExtraCoverage)]
public class SharedCacheTests : TestsWithMultiEnlistment
{
private const string WellKnownFile = "Readme.md";
Expand Down