xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[xharness] Don't count the skipped tests as failed (#3660) 

Currently we consider the failed **and** the skipped tests as failures which is confusing. The tests didn't all "fail" because some were just not ran.

This PR updates the summary message to be a little more clear.
This commit is contained in:
Vincent Dondain 2018-03-09 14:55:42 -05:00 коммит произвёл Sebastien Pouliot
Родитель d5b50765f5
Коммит 5158a3c001
1 изменённых файлов: 10 добавлений и 3 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

13
tests/xharness/Jenkins.cs
Просмотреть файл

@ -1345,7 +1345,8 @@ namespace xharness
allTasks.AddRange (allDeviceTasks); allTasks.AddRange (allDeviceTasks);
} }
var failedTests = allTasks.Where ((v) => v.Failed || v.Skipped); var failedTests = allTasks.Where ((v) => v.Failed);
var skippedTests = allTasks.Where ((v) => v.Skipped);
var unfinishedTests = allTasks.Where ((v) => !v.Finished); var unfinishedTests = allTasks.Where ((v) => !v.Finished);
var passedTests = allTasks.Where ((v) => v.Succeeded); var passedTests = allTasks.Where ((v) => v.Succeeded);
var runningTests = allTasks.Where ((v) => v.Running && !v.Waiting); var runningTests = allTasks.Where ((v) => v.Running && !v.Waiting);
@ -1367,7 +1368,9 @@ namespace xharness
markdown_summary.Write (string.Join (", ", list)); markdown_summary.Write (string.Join (", ", list));
markdown_summary.WriteLine (); markdown_summary.WriteLine ();
} else if (failedTests.Any ()) { } else if (failedTests.Any ()) {
markdown_summary.WriteLine ($"{failedTests.Count ()} tests failed, {passedTests.Count ()} tests passed."); markdown_summary.WriteLine ($"{failedTests.Count ()} tests failed, {skippedTests.Count ()} tests skipped, {passedTests.Count ()} tests passed.");
} else if (skippedTests.Any ()) {
markdown_summary.WriteLine ($"{skippedTests.Count ()} tests skipped, {passedTests.Count ()} tests passed.");
} else if (passedTests.Any ()) { } else if (passedTests.Any ()) {
markdown_summary.WriteLine ($"# All {passedTests.Count ()} tests passed"); markdown_summary.WriteLine ($"# All {passedTests.Count ()} tests passed");
} else { } else {
@ -1694,6 +1697,8 @@ function toggleAll (show)
; // default ; // default
} else if (failedTests.Any ()) { } else if (failedTests.Any ()) {
headerColor = "red"; headerColor = "red";
} else if (skippedTests.Any ()) {
headerColor = "orange";
} else if (passedTests.Any ()) { } else if (passedTests.Any ()) {
headerColor = "green"; headerColor = "green";
} else { } else {
@ -1713,7 +1718,9 @@ function toggleAll (show)
writer.Write (string.Join (", ", list)); writer.Write (string.Join (", ", list));
writer.Write (")"); writer.Write (")");
} else if (failedTests.Any ()) { } else if (failedTests.Any ()) {
writer.Write ($"{failedTests.Count ()} tests failed, {passedTests.Count ()} tests passed."); writer.Write ($"{failedTests.Count ()} tests failed, {skippedTests.Count ()} tests skipped, {passedTests.Count ()} tests passed");
} else if (skippedTests.Any ()) {
writer.Write ($"{skippedTests.Count ()} tests skipped, {passedTests.Count ()} tests passed");
} else if (passedTests.Any ()) { } else if (passedTests.Any ()) {
writer.Write ($"All {passedTests.Count ()} tests passed"); writer.Write ($"All {passedTests.Count ()} tests passed");
} else { } else {