added SkipOnTeamCity attribute for cancel bulk all tests that suffer from timing issues on the build server

Conflicts:
	src/Tests/Framework/XUnitPlumbing/IntegrationTestDiscoverer.cs

Author: Mpdreamz

src/Tests/Document/Multiple/BulkAll/BulkAllApiTests.cs

@@ -73,7 +73,7 @@ public void ReturnsExpectedResponse()
 			bulkObserver.TotalNumberOfRetries.Should().Be(0);
 		}
 
-		[I]
+		[I, SkipOnTeamCity("this test is extremely flakey on TC, but never fails localy")]
 		public void DisposingObservableCancelsBulkAll()
 		{
 			var index = CreateIndexName();
@@ -116,7 +116,7 @@ public void DisposingObservableCancelsBulkAll()
 			bulkObserver.TotalNumberOfRetries.Should().Be(0);
 		}
 
-		[I]
+		[I, SkipOnTeamCity("this test is extremely flakey on TC, but never fails localy")]
 		public void CancelBulkAll()
 		{
 			var index = CreateIndexName();

src/Tests/Framework/XUnitPlumbing/IntegrationTestDiscoverer.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Xunit;
@@ -8,6 +9,8 @@ namespace Tests.Framework
 {
 	public class IntegrationTestDiscoverer : NestTestDiscoverer
 	{
+		private bool RunningOnTeamCity { get; } = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TEAMCITY_VERSION"));
+
 		public IntegrationTestDiscoverer(IMessageSink diagnosticMessageSink)
 			: base(diagnosticMessageSink, TestClient.Configuration.RunIntegrationTests) { }
 
@@ -19,9 +22,12 @@ protected override bool SkipMethod(ITestFrameworkDiscoveryOptions discoveryOptio
 
 			return SkipClassMarkedWithRequiresPluginFor2XSnapshotBuildTests(classOfMethod)
 				|| TypeSkipVersionAttributeSatisfies(classOfMethod)
-				||  MethodSkipVersionAttributeSatisfies(method);
+				||  MethodSkipVersionAttributeSatisfies(method)
+				|| SkipWhenRunOnTeamCity(classOfMethod, method);
+		}
 		}
 
+		
 		private static bool SkipClassMarkedWithRequiresPluginFor2XSnapshotBuildTests(Type classOfMethod)
 		{
 			var v = TestClient.Configuration.ElasticsearchVersion;
@@ -31,24 +37,27 @@ private static bool SkipClassMarkedWithRequiresPluginFor2XSnapshotBuildTests(Typ
 			return attributes.Any();
 		}
 
-		private static bool TypeSkipVersionAttributeSatisfies(Type classOfMethod)
-		{
-			var attributes = classOfMethod.GetAttributes<SkipVersionAttribute>();
-			if (!attributes.Any()) return false;
+		private bool SkipWhenRunOnTeamCity(Type classOfMethod, MethodInfo info)		{
+			if (!this.RunningOnTeamCity) return false;
 
-			return attributes
-				.SelectMany(a => a.Ranges)
-				.Any(range => TestClient.VersionUnderTestSatisfiedBy(range.ToString()));
+			var attributes = classOfMethod.GetAttributes<SkipOnTeamCityAttribute>().Concat(info.GetAttributes<SkipOnTeamCityAttribute>());
+			return attributes.Any();
 		}
 
-		private static bool MethodSkipVersionAttributeSatisfies(MethodInfo methodInfo)
+		private static bool TypeSkipVersionAttributeSatisfies(Type classOfMethod) =>
+			VersionUnderTestMatchesAttribute(classOfMethod.GetAttributes<SkipVersionAttribute>());
+
+		private static bool MethodSkipVersionAttributeSatisfies(MethodInfo methodInfo) =>
+			VersionUnderTestMatchesAttribute(methodInfo.GetAttributes<SkipVersionAttribute>());
+
+		private static bool VersionUnderTestMatchesAttribute(IEnumerable<SkipVersionAttribute> attributes)
 		{
-			var attributes = methodInfo.GetAttributes<SkipVersionAttribute>();
 			if (!attributes.Any()) return false;
 
 			return attributes
 				.SelectMany(a => a.Ranges)
 				.Any(range => TestClient.VersionUnderTestSatisfiedBy(range.ToString()));
 		}
+
 	}
 }

src/Tests/Framework/XUnitPlumbing/SkipOnTeamCityAttribute.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Tests.Framework
+{
+	public class SkipOnTeamCityAttribute : Attribute
+	{
+		public SkipOnTeamCityAttribute(string reason)
+		{
+		}
+	}
+}

src/Tests/Tests.csproj

@@ -39,4 +39,4 @@
   <ItemGroup>
     <EmbeddedResource Include="Document\Single\Attachment\Attachment_Test_Document.pdf" />
   </ItemGroup>
-</Project>
+</Project>