Skip to content

Commit c9ec20b

Browse files
antoniovs1029antoniovs1029
authored
Handle integration tests and nightly build testing (#5509)
* Make -integrationTests work * Update .yml file * Added the TargetArchitecture properties * Try out -integrationTest * Missed -integrationTest flag * Renamed FunctionalTestBaseClass to IntegrationTestBaseClass * Missed rename * Modified tests to make them more stable
1 parent 8e84aa3 commit c9ec20b

30 files changed

+79
-70
lines changed

‎Microsoft.ML.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TestFramework"
3333
EndProject
3434
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Predictor.Tests", "test\Microsoft.ML.Predictor.Tests\Microsoft.ML.Predictor.Tests.csproj", "{6B047E09-39C9-4583-96F3-685D84CA4117}"
3535
EndProject
36-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Functional.Tests", "test\Microsoft.ML.Functional.Tests\Microsoft.ML.Functional.Tests.csproj", "{CFED9F0C-FF81-4C96-8D5E-0436264CA7B5}"
36+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.IntegrationTests", "test\Microsoft.ML.IntegrationTests\Microsoft.ML.IntegrationTests.csproj", "{CFED9F0C-FF81-4C96-8D5E-0436264CA7B5}"
3737
EndProject
3838
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ResultProcessor", "src\Microsoft.ML.ResultProcessor\Microsoft.ML.ResultProcessor.csproj", "{3769FCC3-9AFF-4C37-97E9-6854324681DF}"
3939
EndProject

‎build/ci/job-template.yml

+9-8
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ jobs:
2525
dotnetPath: $(Build.SourcesDirectory)/.dotnet/dotnet
2626
nugetFeed: https://pkgs.dev.azure.com/dnceng/public/_packaging/MachineLearning/nuget/v3/index.json
2727
nightlyBuildProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NightlyBuild.Tests/Microsoft.ML.NightlyBuild.Tests.csproj
28-
nightlyBuildRunPath: $(Build.SourcesDirectory)/bin/AnyCPU.$(_configuration)/Microsoft.ML.NightlyBuild.Tests/$(_targetFramework)
28+
nightlyBuildRunPath: $(Build.SourcesDirectory)/artifacts/bin/Microsoft.ML.NightlyBuild.Tests/$(_configuration)/$(_targetFramework)
29+
runNightlyBuildProj: $(Build.SourcesDirectory)/test/run-night-build-tests.proj
2930
packageUpdaterProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NugetPackageVersionUpdater/Microsoft.ML.NugetPackageVersionUpdater.csproj
3031
versionFilePath: $(Build.SourcesDirectory)/test/Microsoft.ML.NugetPackageVersionUpdater/latest_versions.txt
3132
PROCDUMP_PATH: '$(Build.SourcesDirectory)/Tools/ProcDump/'
@@ -100,25 +101,25 @@ jobs:
100101
displayName: Update package versions for nightly build
101102
- ${{ if eq(parameters.buildScript, 'build.cmd') }}:
102103
- powershell: |
103-
Get-ChildItem -Path '.\bin\AnyCPU.*' -Recurse |
104+
Get-ChildItem -Path '.\artifacts\bin\*' -Recurse |
104105
Select -ExpandProperty FullName |
105-
Where {$_ -notlike '*\Microsoft.ML.NightlyBuild.Tests*'} |
106+
Where {$_ -NotMatch '.*\\Microsoft\.ML\.NightlyBuild\.Tests.*|.*\\Native.*'} |
106107
sort length -Descending |
107108
Remove-Item -force
108109
Write-Output "Done cleaning up usless project..."
109110
displayName: Clean up useless project
110-
- script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
111+
- script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
111112
displayName: Build Nightly-Build Project with latest package versions
112-
- script: ${{ parameters.buildScript }} /p:Build=false -$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -runnightlybuildtests /p:RestorePackagesPath=$(Build.SourcesDirectory)\packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\packages
113+
- script: $(dotnetPath) msbuild $(runNightlyBuildProj) /t:RunNightlyBuildTests /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }}
113114
displayName: Run Nightly Build Tests
114115
- ${{ if eq(parameters.nightlyBuild, 'false') }}:
115116
- ${{ if eq(parameters.innerLoop, 'false') }}:
116117
- ${{ if and(eq(parameters.runSpecific, 'false'), eq(parameters.useVSTestTask, 'false')) }}:
117118
# TODO: Code coverage needs to be fixed.
118-
- script: ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -ci #-coverage=${{ parameters.codeCoverage }}
119+
- script: ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -integrationTest -ci #-coverage=${{ parameters.codeCoverage }}
119120
displayName: Run All Tests.
120121
- ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
121-
- script: ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -ci /p:TestRunnerAdditionalArguments='-trait$(spaceValue)Category=RunSpecificTest' /p:RestorePackagesPath=$(Build.SourcesDirectory)\packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\packages #-coverage=${{ parameters.codeCoverage }}
122+
- script: ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -integrationTest -ci /p:TestRunnerAdditionalArguments='-trait$(spaceValue)Category=RunSpecificTest' /p:RestorePackagesPath=$(Build.SourcesDirectory)\packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\packages #-coverage=${{ parameters.codeCoverage }}
122123
displayName: Run Specific Tests.
123124
- ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
124125
- task: VSTest@2
@@ -142,7 +143,7 @@ jobs:
142143
collectDumpOn: onAbortOnly
143144
publishRunAttachments: true
144145
- ${{ if eq(parameters.innerLoop, 'true') }}:
145-
- script: ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -ci /p:TestRunnerAdditionalArguments='-notrait$(spaceValue)Category=SkipInCI' /p:RestorePackagesPath=$(Build.SourcesDirectory)\packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\packages #-coverage=${{ parameters.codeCoverage }}
146+
- script: ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -integrationTest -ci /p:TestRunnerAdditionalArguments='-notrait$(spaceValue)Category=SkipInCI' /p:RestorePackagesPath=$(Build.SourcesDirectory)\packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\packages #-coverage=${{ parameters.codeCoverage }}
146147
displayName: Run CI Tests.
147148
- script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
148149
displayName: Upload coverage to codecov.io

‎src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj

+4
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@
116116
UseSymboliclinksIfPossible="$(CreateSymbolicLinksForPublishFilesIfPossible)" -->
117117
</Target>
118118

119+
<!-- The targets below are needed for arcade -->
120+
119121
<Target Name="Build"
120122
DependsOnTargets="CopyDnnModelFiles" />
121123

@@ -125,4 +127,6 @@
125127

126128
<Target Name="PerformanceTest"/>
127129

130+
<Target Name="IntegrationTest"/>
131+
128132
</Project>

‎test/Microsoft.ML.Functional.Tests/Common.cs renamed to ‎test/Microsoft.ML.IntegrationTests/Common.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
using System.Collections.Generic;
77
using System.Linq;
88
using Microsoft.ML.Data;
9-
using Microsoft.ML.Functional.Tests.Datasets;
9+
using Microsoft.ML.IntegrationTests.Datasets;
1010
using Xunit;
1111
using Xunit.Sdk;
1212

13-
namespace Microsoft.ML.Functional.Tests
13+
namespace Microsoft.ML.IntegrationTests
1414
{
1515
internal static class Common
1616
{

‎test/Microsoft.ML.Functional.Tests/DataIO.cs renamed to ‎test/Microsoft.ML.IntegrationTests/DataIO.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System.IO;
6-
using Microsoft.ML.Functional.Tests.Datasets;
6+
using Microsoft.ML.IntegrationTests.Datasets;
77
using Microsoft.ML.TestFrameworkCommon;
88
using Xunit;
99
using Xunit.Abstractions;
1010

11-
namespace Microsoft.ML.Functional.Tests
11+
namespace Microsoft.ML.IntegrationTests
1212
{
1313
/// <summary>
1414
/// Test data input and output formats.
1515
/// </summary>
16-
public class DataIO : FunctionalTestBaseClass
16+
public class DataIO : IntegrationTestBaseClass
1717
{
1818
// Separators to test
1919
private readonly char[] _separators;

‎test/Microsoft.ML.Functional.Tests/DataTransformation.cs renamed to ‎test/Microsoft.ML.IntegrationTests/DataTransformation.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System;
6-
using Microsoft.ML.Functional.Tests.Datasets;
6+
using Microsoft.ML.IntegrationTests.Datasets;
77
using Microsoft.ML.TestFrameworkCommon;
88
using Microsoft.ML.Trainers;
99
using Microsoft.ML.Transforms.Text;
1010
using Xunit;
1111
using Xunit.Abstractions;
1212
using static Microsoft.ML.Transforms.HashingEstimator;
1313

14-
namespace Microsoft.ML.Functional.Tests
14+
namespace Microsoft.ML.IntegrationTests
1515
{
16-
public class DataTransformation : FunctionalTestBaseClass
16+
public class DataTransformation : IntegrationTestBaseClass
1717
{
1818
public DataTransformation(ITestOutputHelper output) : base(output)
1919
{

‎test/Microsoft.ML.Functional.Tests/Datasets/Adult.cs renamed to ‎test/Microsoft.ML.IntegrationTests/Datasets/Adult.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using Microsoft.ML.Data;
66

7-
namespace Microsoft.ML.Functional.Tests.Datasets
7+
namespace Microsoft.ML.IntegrationTests.Datasets
88
{
99
/// <summary>
1010
/// A class for the Adult test dataset.

‎test/Microsoft.ML.Functional.Tests/Datasets/CommonColumns.cs renamed to ‎test/Microsoft.ML.IntegrationTests/Datasets/CommonColumns.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
namespace Microsoft.ML.Functional.Tests.Datasets
5+
namespace Microsoft.ML.IntegrationTests.Datasets
66
{
77
/// <summary>
88
/// A class to hold a feature column.

‎test/Microsoft.ML.Functional.Tests/Datasets/HousingRegression.cs renamed to ‎test/Microsoft.ML.IntegrationTests/Datasets/HousingRegression.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using Microsoft.ML.Data;
66

7-
namespace Microsoft.ML.Functional.Tests.Datasets
7+
namespace Microsoft.ML.IntegrationTests.Datasets
88
{
99
/// <summary>
1010
/// A schematized class for loading the HousingRegression dataset.

‎test/Microsoft.ML.Functional.Tests/Datasets/Iris.cs renamed to ‎test/Microsoft.ML.IntegrationTests/Datasets/Iris.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System;
77
using Microsoft.ML.Data;
88

9-
namespace Microsoft.ML.Functional.Tests.Datasets
9+
namespace Microsoft.ML.IntegrationTests.Datasets
1010
{
1111
/// <summary>
1212
/// A class for the Iris test dataset.

‎test/Microsoft.ML.Functional.Tests/Datasets/MnistOneClass.cs renamed to ‎test/Microsoft.ML.IntegrationTests/Datasets/MnistOneClass.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using Microsoft.ML.Data;
66

7-
namespace Microsoft.ML.Functional.Tests.Datasets
7+
namespace Microsoft.ML.IntegrationTests.Datasets
88
{
99
internal sealed class MnistOneClass
1010
{

‎test/Microsoft.ML.Functional.Tests/Datasets/Sentiment.cs renamed to ‎test/Microsoft.ML.IntegrationTests/Datasets/Sentiment.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using Microsoft.ML.Data;
66

7-
namespace Microsoft.ML.Functional.Tests.Datasets
7+
namespace Microsoft.ML.IntegrationTests.Datasets
88
{
99
/// <summary>
1010
/// A class for reading in the Sentiment test dataset.

‎test/Microsoft.ML.Functional.Tests/Datasets/TrivialMatrixFactorization.cs renamed to ‎test/Microsoft.ML.IntegrationTests/Datasets/TrivialMatrixFactorization.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
using Microsoft.ML.Data;
77

8-
namespace Microsoft.ML.Functional.Tests.Datasets
8+
namespace Microsoft.ML.IntegrationTests.Datasets
99
{
1010
/// <summary>
1111
/// A class describing the TrivialMatrixFactorization test dataset.

‎test/Microsoft.ML.Functional.Tests/Datasets/TypeTestData.cs renamed to ‎test/Microsoft.ML.IntegrationTests/Datasets/TypeTestData.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Collections.Generic;
77
using Microsoft.ML.Data;
88

9-
namespace Microsoft.ML.Functional.Tests.Datasets
9+
namespace Microsoft.ML.IntegrationTests.Datasets
1010
{
1111
/// <summary>
1212
/// A class containing one property per <see cref="DataKind"/>.

‎test/Microsoft.ML.Functional.Tests/Debugging.cs renamed to ‎test/Microsoft.ML.IntegrationTests/Debugging.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
using System.Collections.Concurrent;
66
using System.Collections.Generic;
77
using Microsoft.ML.Data;
8-
using Microsoft.ML.Functional.Tests.Datasets;
8+
using Microsoft.ML.IntegrationTests.Datasets;
99
using Microsoft.ML.TestFrameworkCommon;
1010
using Microsoft.ML.Trainers;
1111
using Microsoft.ML.Transforms.Text;
1212
using Xunit;
1313
using Xunit.Abstractions;
1414

15-
namespace Microsoft.ML.Functional.Tests
15+
namespace Microsoft.ML.IntegrationTests
1616
{
17-
public class Debugging : FunctionalTestBaseClass
17+
public class Debugging : IntegrationTestBaseClass
1818
{
1919
public Debugging(ITestOutputHelper output) : base(output)
2020
{

‎test/Microsoft.ML.Functional.Tests/Evaluation.cs renamed to ‎test/Microsoft.ML.IntegrationTests/Evaluation.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
// See the LICENSE file in the project root for more information.
44

55
using Microsoft.ML.Data;
6-
using Microsoft.ML.Functional.Tests.Datasets;
6+
using Microsoft.ML.IntegrationTests.Datasets;
77
using Microsoft.ML.TestFrameworkCommon;
88
using Microsoft.ML.TestFrameworkCommon.Attributes;
99
using Microsoft.ML.Trainers;
1010
using Microsoft.ML.Trainers.FastTree;
1111
using Xunit;
1212
using Xunit.Abstractions;
1313

14-
namespace Microsoft.ML.Functional.Tests
14+
namespace Microsoft.ML.IntegrationTests
1515
{
16-
public class Evaluation : FunctionalTestBaseClass
16+
public class Evaluation : IntegrationTestBaseClass
1717
{
1818
public Evaluation(ITestOutputHelper output): base(output)
1919
{

‎test/Microsoft.ML.Functional.Tests/Explainability.cs renamed to ‎test/Microsoft.ML.IntegrationTests/Explainability.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
// See the LICENSE file in the project root for more information.
44

55
using Microsoft.ML.Data;
6-
using Microsoft.ML.Functional.Tests.Datasets;
6+
using Microsoft.ML.IntegrationTests.Datasets;
77
using Microsoft.ML.TestFrameworkCommon;
88
using Microsoft.ML.Trainers;
99
using Microsoft.ML.Trainers.FastTree;
1010
using Xunit;
1111
using Xunit.Abstractions;
1212

13-
namespace Microsoft.ML.Functional.Tests
13+
namespace Microsoft.ML.IntegrationTests
1414
{
1515
/// <summary>
1616
/// Test explainability features.
1717
/// </summary>
18-
public class Explainability : FunctionalTestBaseClass
18+
public class Explainability : IntegrationTestBaseClass
1919
{
2020
public Explainability(ITestOutputHelper output) : base(output)
2121
{
@@ -36,13 +36,13 @@ public void GlobalFeatureImportanceWithPermutationFeatureImportance(bool saveMod
3636

3737
// Create a pipeline to train on the housing data.
3838
var pipeline = mlContext.Transforms.Concatenate("Features", HousingRegression.Features)
39-
.Append(mlContext.Regression.Trainers.Sdca());
39+
.Append(mlContext.Regression.Trainers.FastTree());
4040

4141
// Fit the pipeline
4242
var model = pipeline.Fit(data);
4343

4444
IDataView transformedData;
45-
RegressionPredictionTransformer<LinearRegressionModelParameters> linearPredictor;
45+
RegressionPredictionTransformer<FastTreeRegressionModelParameters> linearPredictor;
4646

4747
if(saveModel)
4848
{
@@ -57,7 +57,7 @@ public void GlobalFeatureImportanceWithPermutationFeatureImportance(bool saveMod
5757
transformedData = loadedModel.Transform(data);
5858

5959
// Extract linear predictor
60-
linearPredictor = (loadedModel as TransformerChain<ITransformer>).LastTransformer as RegressionPredictionTransformer<LinearRegressionModelParameters>;
60+
linearPredictor = (loadedModel as TransformerChain<ITransformer>).LastTransformer as RegressionPredictionTransformer<FastTreeRegressionModelParameters>;
6161
}
6262
else
6363
{

‎test/Microsoft.ML.Functional.Tests/FunctionalTestBaseClass.cs renamed to ‎test/Microsoft.ML.IntegrationTests/IntegrationTestBaseClass.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
using Microsoft.ML.TestFrameworkCommon.Attributes;
1313
using Xunit.Abstractions;
1414

15-
namespace Microsoft.ML.Functional.Tests
15+
namespace Microsoft.ML.IntegrationTests
1616
{
17-
public class FunctionalTestBaseClass : IDisposable
17+
public class IntegrationTestBaseClass : IDisposable
1818
{
19-
static FunctionalTestBaseClass()
19+
static IntegrationTestBaseClass()
2020
{
2121
RootDir = TestCommon.GetRepoRoot();
2222
DataDir = Path.Combine(RootDir, "test", "data");
@@ -31,20 +31,20 @@ static FunctionalTestBaseClass()
3131
protected static string DataDir { get; }
3232
protected ITestOutputHelper Output { get; }
3333

34-
public FunctionalTestBaseClass(ITestOutputHelper output)
34+
public IntegrationTestBaseClass(ITestOutputHelper output)
3535
{
3636
//This locale is currently set for tests only so that the produced output
3737
//files can be compared on systems with other locales to give set of known
3838
//correct results that are on en-US locale.
3939
Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
4040

4141
#if NETFRAMEWORK
42-
string codeBaseUri = typeof(FunctionalTestBaseClass).Assembly.CodeBase;
42+
string codeBaseUri = typeof(IntegrationTestBaseClass).Assembly.CodeBase;
4343
string path = new Uri(codeBaseUri).AbsolutePath;
4444
var currentAssemblyLocation = new FileInfo(Directory.GetParent(path).FullName);
4545
#else
4646
// There is an extra folder in the netfx path representing the runtime identifier.
47-
var currentAssemblyLocation = new FileInfo(typeof(FunctionalTestBaseClass).Assembly.Location);
47+
var currentAssemblyLocation = new FileInfo(typeof(IntegrationTestBaseClass).Assembly.Location);
4848
#endif
4949
OutDir = Path.Combine(currentAssemblyLocation.Directory.FullName, "TestOutput");
5050
Directory.CreateDirectory(OutDir);

‎test/Microsoft.ML.Functional.Tests/IntrospectiveTraining.cs renamed to ‎test/Microsoft.ML.IntegrationTests/IntrospectiveTraining.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
using System.Collections.Immutable;
88
using System.Linq;
99
using Microsoft.ML.Data;
10-
using Microsoft.ML.Functional.Tests.Datasets;
10+
using Microsoft.ML.IntegrationTests.Datasets;
1111
using Microsoft.ML.TestFrameworkCommon;
1212
using Microsoft.ML.Trainers;
1313
using Microsoft.ML.Trainers.FastTree;
1414
using Microsoft.ML.Transforms;
1515
using Xunit;
1616
using Xunit.Abstractions;
1717

18-
namespace Microsoft.ML.Functional.Tests
18+
namespace Microsoft.ML.IntegrationTests
1919
{
20-
public class IntrospectiveTraining : FunctionalTestBaseClass
20+
public class IntrospectiveTraining : IntegrationTestBaseClass
2121
{
2222
public IntrospectiveTraining(ITestOutputHelper output) : base(output)
2323
{

‎test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj renamed to ‎test/Microsoft.ML.IntegrationTests/Microsoft.ML.IntegrationTests.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<!-- DON'T CHANGE THIS!!! We are turning off strong naming to ensure we never add `InternalsVisibleTo` for these tests -->
77
<PublicSign>false</PublicSign>
88
<ReferenceTypeForTestFramework>Project</ReferenceTypeForTestFramework>
9+
10+
<IsUnitTestProject>false</IsUnitTestProject>
11+
<IsIntegrationTestProject>true</IsIntegrationTestProject>
12+
913
</PropertyGroup>
1014

1115
<ItemGroup>

‎test/Microsoft.ML.Functional.Tests/ModelFiles.cs renamed to ‎test/Microsoft.ML.IntegrationTests/ModelFiles.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
using System.Text.RegularExpressions;
1010
using Microsoft.ML.Calibrators;
1111
using Microsoft.ML.Data;
12-
using Microsoft.ML.Functional.Tests.Datasets;
12+
using Microsoft.ML.IntegrationTests.Datasets;
1313
using Microsoft.ML.TestFrameworkCommon;
1414
using Microsoft.ML.Trainers.FastTree;
1515
using Microsoft.ML.Transforms;
1616
using Xunit;
1717
using Xunit.Abstractions;
1818

19-
namespace Microsoft.ML.Functional.Tests
19+
namespace Microsoft.ML.IntegrationTests
2020
{
21-
public partial class ModelFiles : FunctionalTestBaseClass
21+
public partial class ModelFiles : IntegrationTestBaseClass
2222
{
2323
public ModelFiles(ITestOutputHelper output) : base(output)
2424
{

0 commit comments

Comments
 (0)