Merge pull request #886 from Tasteful/fix/failing-tests

gmarz · gmarz · commit bc41b0b8f25d · 2014-08-18T12:09:27.000-04:00
Fixing tests that are failing in some environments
diff --git a/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkUpdateTests.cs b/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkUpdateTests.cs
@@ -5,7 +5,8 @@
 
 namespace Nest.Tests.Integration.Core.Bulk
 {
-	public class BulkUpdateTests : BulkTests
+	[TestFixture]
+	public class BulkUpdateTests : IntegrationTests
 	{
 
 		[Test]
diff --git a/src/Tests/Nest.Tests.Integration/Core/TermVectors/MultiTermVectorsTests.cs b/src/Tests/Nest.Tests.Integration/Core/TermVectors/MultiTermVectorsTests.cs
@@ -55,7 +55,7 @@ public void MultiTermVectorsTest_DocumentsInBody()
 		}
 
 		[Test]
-		[SkipVersion("1.2.0 - 1.2.2", "Fails against ES 1.2: https://github.com/elasticsearch/elasticsearch/issues/6451")]
+		[SkipVersion("1.2.0 - 1.3.1", "Fails from ES 1.2: https://github.com/elasticsearch/elasticsearch/issues/6451")]
 		public void MultiTermVectorsNonExistentIdTest()
 		{
 			var result = Client.MultiTermVectors<ElasticsearchProject>(s => s

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@`
`5`	`5`
`6`	`6`	`namespace Nest.Tests.Integration.Core.Bulk`
`7`	`7`	`{`
`8`		`- public class BulkUpdateTests : BulkTests`
	`8`	`+ [TestFixture]`
	`9`	`+ public class BulkUpdateTests : IntegrationTests`
`9`	`10`	`{`
`10`	`11`
`11`	`12`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public void MultiTermVectorsTest_DocumentsInBody()`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`[Test]`
`58`		`- [SkipVersion("1.2.0 - 1.2.2", "Fails against ES 1.2: https://github.com/elasticsearch/elasticsearch/issues/6451")]`
	`58`	`+ [SkipVersion("1.2.0 - 1.3.1", "Fails from ES 1.2: https://github.com/elasticsearch/elasticsearch/issues/6451")]`
`59`	`59`	`public void MultiTermVectorsNonExistentIdTest()`
`60`	`60`	`{`
`61`	`61`	`var result = Client.MultiTermVectors<ElasticsearchProject>(s => s`