Test: add extra behaviour to testing suite (#209)

* add extra behavior to testing suite

This commit adds one more option to running the test suite, to instruct
it to rewrite the config file of an existing ES bundle. This is just a
convenience option.

* address review comments

- s/rezet/full*reset
- improve help message format.

Author: bpintea

test/integration/elasticsearch.py

@@ -140,9 +140,9 @@ def _fetch_elasticsearch(self, version, dest_dir):
 
 		return dest_file
 
-	def _update_es_yaml(self, es_dir):
+	def _update_es_yaml(self, es_dir, append=True):
 		yaml = os.path.join(es_dir, "config", "elasticsearch.yml")
-		with open(yaml, mode="a", newline="\n") as f:
+		with open(yaml, mode="a" if append else "w", newline="\n") as f:
 			f.write("#\n# ODBC Integration Test\n#\n")
 			f.write("xpack.security.enabled: True\n")
 			f.write("http.port: %s\n" % self._port) # don't bind on next avail port
@@ -259,7 +259,7 @@ def spawn(self, version, root_dir=None, ephemeral=False):
 		self._start_elasticsearch(es_dir)
 		self._enable_xpack(es_dir)
 
-	def reset(self, es_dir):
+	def reset(self, es_dir, reset_conf=False):
 		# make sure there's no instance running
 		try:
 			if self.is_listening():
@@ -277,6 +277,8 @@ def reset(self, es_dir):
 				else:
 					os.remove(path)
 
+		if reset_conf:
+			self._update_es_yaml(es_dir, False)
 		self._start_elasticsearch(es_dir)
 		self._enable_xpack(es_dir)
 

test/integration/ites.py

@@ -21,9 +21,10 @@ def ites(args):
 
 	# create a running instance of Elasticsearch if needed
 	if args.url is None:
-		if args.es_reset:
-			es_dir = os.path.abspath(args.es_reset)
-			es.reset(es_dir)
+		es_reset = args.es_full_reset or args.es_reset
+		if es_reset:
+			es_dir = os.path.abspath(es_reset)
+			es.reset(es_dir, args.es_full_reset is not None)
 		else:
 			assert(args.root_dir)
 			root_dir = os.path.abspath(args.root_dir)
@@ -79,7 +80,9 @@ def main():
 	stage_grp = parser.add_mutually_exclusive_group()
 	stage_grp.add_argument("-r", "--root-dir", help="Root directory to [temporarily] stage Elasticsearch into.")
 	stage_grp.add_argument("-s", "--es-reset", help="Path to an already configured Elasticsearch folder to "
-			"use; data directory content will be removed; 'ephemeral' will be ignored.")
+			"use; data directory content will be removed; 'ephemeral' will be ignored.", dest="ES_DIR")
+	stage_grp.add_argument("-S", "--es-full-reset", help="Path to the Elasticsearch folder; config file and data "
+			"directory content will be removed; 'ephemeral' will be ignored.", dest="ES_DIR")
 	stage_grp.add_argument("-p", "--url", help="Use a pre-staged and running Elasticsearch instance. If no URL is "
 			"provided, %s is assumed." % Elasticsearch.ES_BASE_URL, nargs="?", const="")
 
@@ -103,10 +106,10 @@ def main():
 			"default.")
 
 	args = parser.parse_args()
-	if not (args.root_dir or args.es_reset or args.url is not None):
+	if not (args.root_dir or args.es_reset or args.es_full_reset or args.url is not None):
 		parser.error("no Elasticsearch instance or root/staged directory provided.")
 
-	if not (args.driver or args.version or args.es_reset or args.url is not None):
+	if not (args.driver or args.version or args.es_reset or args.es_full_reset or args.url is not None):
 		parser.error("don't know what Elasticsearch version to test against.")
 
 	if args.driver and args.dsn and "Driver=" in args.dsn: