From 260e3548b28b6c48fa34a235f740ea312a229175 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 23 Nov 2016 10:33:10 +0100 Subject: [PATCH] make test order stable in teamcity performance tests --- platform/testFramework/src/com/intellij/TestAll.java | 2 +- platform/testFramework/src/com/intellij/TestCaseLoader.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/platform/testFramework/src/com/intellij/TestAll.java b/platform/testFramework/src/com/intellij/TestAll.java index 9e1d45db93dc..1e1d0138e37b 100644 --- a/platform/testFramework/src/com/intellij/TestAll.java +++ b/platform/testFramework/src/com/intellij/TestAll.java @@ -440,7 +440,7 @@ public class TestAll implements Test { return realFreeMemory < needed; } - private static boolean isPerformanceTestsRun() { + static boolean isPerformanceTestsRun() { return PERFORMANCE_TESTS_ONLY; } diff --git a/platform/testFramework/src/com/intellij/TestCaseLoader.java b/platform/testFramework/src/com/intellij/TestCaseLoader.java index 1e94a376372e..65e707058af0 100644 --- a/platform/testFramework/src/com/intellij/TestCaseLoader.java +++ b/platform/testFramework/src/com/intellij/TestCaseLoader.java @@ -182,6 +182,10 @@ public class TestCaseLoader { private static final List ourRankList = getTeamCityRankList(); private static List getTeamCityRankList() { + if (TestAll.isPerformanceTestsRun()) { + return Collections.emptyList(); + } + String filePath = System.getProperty("teamcity.tests.recentlyFailedTests.file", null); if (filePath != null) { try {