[tests] Make sampletester greener (#10713)
* [tests][sampletester] Add nuget.org single feed to sampletester Since we no longer upstream to nuget.org our sampletester is not able to find packages so we create a nuget config file with a single source to nuget.org to fix it and still be compliant. * [tests][sampletester] Remove ConferenceVision sample, it no longer exists * [tests][sampletester] Double TimeOut for a couple of tests
This commit is contained in:
Родитель
88505f85f1
Коммит
f29592e7cf
|
@ -24,14 +24,21 @@ namespace Xamarin.Tests {
|
||||||
{
|
{
|
||||||
var nuget_conf = Path.Combine (root, "NuGet.config");
|
var nuget_conf = Path.Combine (root, "NuGet.config");
|
||||||
// We're cloning into a subdirectory of xamarin-macios, which already has a NuGet.config
|
// We're cloning into a subdirectory of xamarin-macios, which already has a NuGet.config
|
||||||
// So create a Nuget.config that clears out any previous configuration, so that none of the
|
// So create a Nuget.config that clears out any previous configuration and adds nuget.org as
|
||||||
// sample tests pick up xamarin-macios' NuGet.config.
|
// single nuget source so that none of the sample tests pick up xamarin-macios' NuGet.config.
|
||||||
File.WriteAllText (nuget_conf,
|
File.WriteAllText (nuget_conf,
|
||||||
@"<?xml version=""1.0"" encoding=""utf-8""?>
|
@"<?xml version=""1.0"" encoding=""utf-8""?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<config>
|
<config>
|
||||||
<clear />
|
<clear />
|
||||||
</config>
|
</config>
|
||||||
|
<packageSources>
|
||||||
|
<clear />
|
||||||
|
<add key=""nuget.org"" value=""https://api.nuget.org/v3/index.json"" />
|
||||||
|
</packageSources>
|
||||||
|
<disabledPackageSources>
|
||||||
|
<clear />
|
||||||
|
</disabledPackageSources>
|
||||||
</configuration>
|
</configuration>
|
||||||
");
|
");
|
||||||
}
|
}
|
||||||
|
|
|
@ -164,7 +164,8 @@ namespace Samples {
|
||||||
|
|
||||||
static IEnumerable<SampleTestData> GetSampleData ()
|
static IEnumerable<SampleTestData> GetSampleData ()
|
||||||
{
|
{
|
||||||
return GetSampleTestData (test_data, ORG, REPO, HASH, DEFAULT_BRANCH, DefaultTimeout);
|
// Samples.XamarinFormsTester.BuildSample(MarkupExtensions.iOS: Debug|iPhone) needs some extra time 10 minutes
|
||||||
|
return GetSampleTestData (test_data, ORG, REPO, HASH, DEFAULT_BRANCH, TimeSpan.FromMinutes (10));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -189,7 +190,8 @@ namespace Samples {
|
||||||
|
|
||||||
static IEnumerable<SampleTestData> GetSampleData ()
|
static IEnumerable<SampleTestData> GetSampleData ()
|
||||||
{
|
{
|
||||||
return GetSampleTestData (test_data, ORG, REPO, HASH, DEFAULT_BRANCH, DefaultTimeout);
|
// Samples.XamarinFormsBooksTester.BuildSample(FormattedTextToggle.iOS: Release|iPhone) needs some extra time 10 minutes
|
||||||
|
return GetSampleTestData (test_data, ORG, REPO, HASH, DEFAULT_BRANCH, TimeSpan.FromMinutes (10));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -249,23 +251,4 @@ namespace Samples {
|
||||||
return GetSampleTestData (test_data, ORG, REPO, HASH, DEFAULT_BRANCH, timeout: TimeSpan.FromMinutes (10));
|
return GetSampleTestData (test_data, ORG, REPO, HASH, DEFAULT_BRANCH, timeout: TimeSpan.FromMinutes (10));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[Category (CATEGORY)]
|
|
||||||
public class ConferenceVisionTester : SampleTester {
|
|
||||||
const string ORG = "microsoft";
|
|
||||||
const string REPO = "ConferenceVision";
|
|
||||||
const string CATEGORY = "microsoftconferencevision"; // categories can't contain dashes
|
|
||||||
const string HASH = "b477f99c9e23097b31168697b2c168e90c34fd4d";
|
|
||||||
const string DEFAULT_BRANCH = "master";
|
|
||||||
|
|
||||||
static Dictionary<string, SampleTest> test_data = new Dictionary<string, SampleTest> {
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
static IEnumerable<SampleTestData> GetSampleData ()
|
|
||||||
{
|
|
||||||
return GetSampleTestData (test_data, ORG, REPO, HASH, DEFAULT_BRANCH, DefaultTimeout);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче