Revert "Add tests configuration option to allow skipping of plugin verification"

This reverts commit 3d61c0a.

Author: gmarz

src/Tests/Framework/Configuration/EnvironmentConfiguration.cs

@@ -12,7 +12,6 @@ public class EnvironmentConfiguration : TestConfigurationBase
 		public override bool ForceReseed { get; protected set; } = true;
 		public override string ElasticsearchVersion { get; protected set; }
 		public override TestMode Mode { get; protected set; } = TestMode.Unit;
-		public override bool SkipPluginVerification { get; protected set; } = false;
 
 		public EnvironmentConfiguration()
 		{

src/Tests/Framework/Configuration/ITestConfiguration.cs

@@ -10,9 +10,9 @@ public interface ITestConfiguration
 	{
 		TestMode Mode { get; }
 		string ElasticsearchVersion { get; }
-		bool ForceReseed { get; }
+		bool ForceReseed { get; } 
 		bool DoNotSpawnIfAlreadyRunning { get; }
-		bool SkipPluginVerification { get; }
+
 		bool RunIntegrationTests { get; }
 		bool RunUnitTests { get; }
 	}

src/Tests/Framework/Configuration/TestConfigurationBase.cs

@@ -10,9 +10,8 @@ public abstract class TestConfigurationBase : ITestConfiguration
 	{
 		public abstract bool DoNotSpawnIfAlreadyRunning { get; protected set; }
 		public abstract string ElasticsearchVersion { get; protected set; }
-		public abstract bool ForceReseed { get; protected set; }
+		public abstract bool ForceReseed { get; protected set; } 
 		public abstract TestMode Mode { get; protected set; }
-		public abstract bool SkipPluginVerification { get; protected set; }
 
 		public virtual bool RunIntegrationTests => Mode == TestMode.Mixed || Mode == TestMode.Integration;
 		public virtual bool RunUnitTests => Mode == TestMode.Mixed || Mode == TestMode.Unit;

src/Tests/Framework/Configuration/YamlConfiguration.cs

@@ -10,22 +10,20 @@ public class YamlConfiguration : TestConfigurationBase
 		public override string ElasticsearchVersion { get; protected set; } = "2.0.0";
 		public override bool ForceReseed { get; protected set; } = true;
 		public override TestMode Mode { get; protected set; } = TestMode.Unit;
-		public override bool SkipPluginVerification { get; protected set; } = false;
 
 
 		public YamlConfiguration(string configurationFile)
 		{
 			if (!File.Exists(configurationFile)) return;
 
 			var config = File.ReadAllLines(configurationFile)
-				.Where(l=> !string.IsNullOrEmpty(l) && !l.Trim().StartsWith("#"))
+				.Where(l=>!l.Trim().StartsWith("#"))
 				.ToDictionary(ConfigName, ConfigValue);
 
 			this.Mode = GetTestMode(config["mode"]);
 			this.ElasticsearchVersion = config["elasticsearch_version"];
 			this.ForceReseed = bool.Parse(config["force_reseed"]);
 			this.DoNotSpawnIfAlreadyRunning = bool.Parse(config["do_not_spawn"]);
-			this.SkipPluginVerification = bool.Parse(config["skip_plugin_verification"]);
 		}
 
 		private static string ConfigName(string configLine) => Parse(configLine, 0);

src/Tests/Framework/Integration/Clusters/ClusterBase.cs

@@ -15,23 +15,13 @@ public abstract class ClusterBase : IIntegrationCluster, IDisposable
 
 		protected ClusterBase()
 		{
-			var name = this.GetType().Name.Replace("Cluster", "");
-
-			this.Node = new ElasticsearchNode(
-				TestClient.Configuration.ElasticsearchVersion,
-				TestClient.Configuration.RunIntegrationTests,
-				DoNotSpawnIfAlreadyRunning,
-				name,
-				EnableShield,
-				TestClient.Configuration.SkipPluginVerification
-			);
-
+			var name = this.GetType().Name.Replace("Cluster", "");
+			this.Node = new ElasticsearchNode(TestClient.Configuration.ElasticsearchVersion, TestClient.Configuration.RunIntegrationTests, DoNotSpawnIfAlreadyRunning, name, EnableShield);
 			this.Node.BootstrapWork.Subscribe(handle =>
 			{
 				this.Boostrap();
 				handle.Set();
 			});
-
 			this.ConsoleOut = this.Node.Start(name, this.ServerSettings);
 		}
 

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

@@ -34,7 +34,6 @@ public class ElasticsearchNode : IDisposable
 
 		private readonly bool _doNotSpawnIfAlreadyRunning;
 		private readonly bool _shieldEnabled;
-		private readonly bool _skipPluginVerification;
 		private ObservableProcess _process;
 		private IDisposable _processListener;
 
@@ -104,13 +103,11 @@ public ElasticsearchNode(
 			bool runningIntegrations,
 			bool doNotSpawnIfAlreadyRunning,
 			string name,
-			bool shieldEnabled,
-			bool skipPluginVerification
+			bool shieldEnabled
 			)
 		{
 			this._doNotSpawnIfAlreadyRunning = doNotSpawnIfAlreadyRunning;
 			this._shieldEnabled = shieldEnabled;
-			this._skipPluginVerification = skipPluginVerification;
 
 			var prefix = name.ToLowerInvariant();
 			var suffix = Guid.NewGuid().ToString("N").Substring(0, 6);
@@ -215,9 +212,9 @@ public IObservable<ElasticsearchMessage> Start(string typeOfCluster, string[] ad
 
 			if (handle.WaitOne(this.HandleTimeout, true)) return observable;
 
-			this.Stop();
+				this.Stop();
 			throw new Exception($"Could not start elasticsearch within {this.HandleTimeout}");
-		}
+			}
 
 #if DOTNETCORE
 		private IObservable<ElasticsearchMessage> UseAlreadyRunningInstance(Signal handle)
@@ -232,13 +229,11 @@ private IObservable<ElasticsearchMessage> UseAlreadyRunningInstance(ManualResetE
 
 			if (!alreadyUp.IsValid) return null;
 
-			if (!_skipPluginVerification)
-			{
-				var checkPlugins = client.CatPlugins();
-				var missingPlugins = SupportedPlugins.Keys.Except(checkPlugins.Records.Select(r => r.Component)).ToList();
-				if (missingPlugins.Any())
-					throw new Exception($"Already running elasticsearch missed the following plugin(s): {string.Join(", ", missingPlugins)}.");
-			}
+			var checkPlugins = client.CatPlugins();
+
+			var missingPlugins = SupportedPlugins.Keys.Except(checkPlugins.Records.Select(r => r.Component)).ToList();
+			if (missingPlugins.Any())
+				throw new Exception($"Already running elasticsearch missed the following plugin(s): {string.Join(", ", missingPlugins)}.");
 
 			this.Started = true;
 			this.Port = 9200;
@@ -283,6 +278,8 @@ private void ValidateLicense()
 
 			if (license.License.Status == LicenseStatus.Invalid)
 				throw new Exception($"{exceptionMessageStart} but the license is invalid!");
+
+
 		}
 
 #if DOTNETCORE

src/Tests/Framework/MockData/Project.cs

@@ -22,7 +22,6 @@ public class Project
 		public SimpleGeoPoint Location { get; set; }
 		public int? NumberOfCommits { get; set; }
 		public CompletionField Suggest { get; set; }
-		public IList<string> Branches { get; set; }
 
 		public static Faker<Project> Generator { get; } =
 			new Faker<Project>()

src/Tests/tests.yaml

@@ -1,16 +1,8 @@
-# Dictates what types of tests should be run.
-# Can be "u" (unit tests), "i" (integration tests) or "m" (mixed: run both unit and integration tests)
-mode: m
-
-# The elasticsearch version that should be started
-elasticsearch_version: 5.0.0-alpha2-SNAPSHOT
-
-# Whether we want to forcefully reseed on the node, if you are starting the tests with a node already running
+# mode either u (unit test), i (integration test) or m (mixed mode)
+mode: u
+# the elasticsearch version that should be started
+elasticsearch_version: 5.0.0-alpha1
+# whether we want to forcefully reseed on the node, if you are starting the tests with a node already running
 force_reseed: true
-
-# Do not spawn nodes as part of the test setup but instead rely on a manually started ES node being up
-do_not_spawn: true
-
-# Skip verification of installed plugins on an already running node.  
-# Useful for quickly running integration tests that do not rely on any plugins being installed.
-skip_plugin_verification: true
+# do not spawn nodes as part of the test setup but rely on a manually started es node being up
+do_not_spawn: true