Fix broken integration tests

When comparing ComparisonValues on PropertyName for equality, us .Equals() instead of == operator
Add Automap documentation for ignoring properties on POCOs
When writing a property as part of PropertyMapping, check that it is not a property that should be ignored

Author: russcam

src/Nest/CommonAbstractions/Infer/PropertyName/PropertyName.cs

@@ -56,7 +56,8 @@ public override bool Equals(object obj)
 			var other = obj as PropertyName;
 			if (other == null)
 				return false;
-			return ComparisonValue == other.ComparisonValue;
+
+			return ComparisonValue.Equals(other.ComparisonValue);
 		}
 
 		string IUrlParameter.GetString(IConnectionConfigurationValues settings)

src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/VerbatimDictionaryKeysConverter.cs

@@ -44,15 +44,28 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				else if (fieldName != null)
 					key = settings.Inferrer.Field(fieldName);
 				else if (propertyName != null)
+				{
+					if (propertyName.Property != null)
+					{
+						IPropertyMapping mapping;
+						if (settings.PropertyMappings.TryGetValue(propertyName.Property, out mapping) && mapping.Ignore)
+						{
+							continue;
+						}
+					}
+
 					key = settings.Inferrer.PropertyName(propertyName);
+				}
 				else if (indexName != null)
 					key = settings.Inferrer.IndexName(indexName);
 				else if (typeName != null)
 					key = settings.Inferrer.TypeName(typeName);
 				else
 					key = Convert.ToString(entry.Key, CultureInfo.InvariantCulture);
+
 				writer.WritePropertyName(key);
 				serializer.Serialize(writer, entry.Value);
+
 			}
 
 			writer.WriteEndObject();

src/Tests/ClientConcepts/HighLevel/Mapping/AutoMap.doc.cs

@@ -581,6 +581,61 @@ public void OverridingAutoMappedAttributes()
 			Expect(expected).WhenSerializing((ICreateIndexRequest) descriptor);
 		}
 
+		[ElasticsearchType(Name = "company")]
+		public class CompanyWithAttributesAndPropertiesToIgnore
+		{
+			public string Name { get; set; }
+
+			[String(Ignore = true)]
+			public string PropertyToIgnore { get; set; }
+
+			public string AnotherPropertyToIgnore { get; set; }
+		}
+
+		/**
+		 * Properties on a POCO can be ignored in a couple of ways:
+		 * - Using the `Ignore` property on a derived `ElasticsearchPropertyAttribute` type applied to the property that cshoule be ignored on the POCO
+		 * - Using the `.InferMappingFor<TDocument>(Func<ClrTypeMappingDescriptor<TDocument>, IClrTypeMapping<TDocument>> selector)` on the connection settings
+		 * This example demonstrates both ways, using the attribute way to ignore the property `PropertyToIgnore` and the infer mapping way to ignore the 
+		 * property `AnotherPropertyToIgnore`
+		 */
+		[U]
+		public void IgnoringProperties()
+		{
+			var descriptor = new CreateIndexDescriptor("myindex")
+				.Mappings(ms => ms
+					.Map<CompanyWithAttributesAndPropertiesToIgnore>(m => m
+						.AutoMap()
+					)
+				);
+
+			/** Thus we do not map properties on the second occurrence of our Child property */
+			var expected = new
+			{
+				mappings = new
+				{
+					company = new
+					{
+						properties = new
+						{
+							name = new
+							{
+								type = "string"
+							}
+						}
+					}
+				}
+			};
+
+			var settings = WithConnectionSettings(s => s
+				.InferMappingFor<CompanyWithAttributesAndPropertiesToIgnore>(i => i
+					.Ignore(p => p.AnotherPropertyToIgnore)
+				)
+			);
+
+			settings.Expect(expected).WhenSerializing((ICreateIndexRequest) descriptor);
+		}
+
 		/**
 		 * If you notice in our previous Company/Employee examples, the Employee type is recursive
 		 * in that itself contains a collection of type Employee.  By default, AutoMap() will only
@@ -593,7 +648,7 @@ public void OverridingAutoMappedAttributes()
 		 *
 		 * Let's introduce a very simple class A, to reduce the noise, which itself has a property
 		 * Child of type A.
-		 */
+		 */
 		public class A
 		{
 			public A Child { get; set; }

src/Tests/Framework/Integration/Process/ElasticsearchNode.cs

@@ -87,7 +87,7 @@ public IObservable<ElasticsearchMessage> Start(string[] additionalSettings = nul
 			if (!this.RunningIntegrations) return Observable.Empty<ElasticsearchMessage>();
 
 			this.Stop();
-			var timeout = TimeSpan.FromSeconds(60);
+			var timeout = TimeSpan.FromMinutes(1);
 			var handle = new ManualResetEvent(false);
 
 			if (_doNotSpawnIfAlreadyRunning)

src/Tests/Framework/TestClient.cs

@@ -59,8 +59,8 @@ public static ConnectionSettings CreateSettings(
 		public static IElasticClient GetInMemoryClient(Func<ConnectionSettings, ConnectionSettings> modifySettings = null, int port = 9200) =>
 			new ElasticClient(CreateSettings(modifySettings, port, forceInMemory: true));
 
-		public static IElasticClient GetInMemoryClient(Func<ConnectionSettings, ConnectionSettings> modifySettings, Func<ConnectionSettings, IElasticsearchSerializer> _serializerFactory) =>
-			new ElasticClient(CreateSettings(modifySettings, forceInMemory: true, serializerFactory: _serializerFactory));
+		public static IElasticClient GetInMemoryClient(Func<ConnectionSettings, ConnectionSettings> modifySettings, Func<ConnectionSettings, IElasticsearchSerializer> serializerFactory) =>
+			new ElasticClient(CreateSettings(modifySettings, forceInMemory: true, serializerFactory: serializerFactory));
 
 		public static IElasticClient GetClient(
 			Func<ConnectionSettings, ConnectionSettings> modifySettings = null, int port = 9200, Func<Uri, IConnectionPool> createPool = null) =>