fix app to run on non-win platforms (#153)

Also:
- relax requirements removing the pyODBC dependency, if not
  performing tests;
- swap trial-mode activation with password generation blocks, since the
  former is now password-protected.

(cherry picked from commit b58692e)

Author: bpintea

test/integration/elasticsearch.py

@@ -148,12 +148,15 @@ def _start_elasticsearch(self, es_dir):
 		start_script = os.path.join(es_dir, "bin", "elasticsearch")
 		if os.name == "nt":
 			start_script += ".bat"
+			creationflags = subprocess.CREATE_NEW_PROCESS_GROUP
+		else:
+			creationflags = 0
 
 		if self.is_listening():
 			raise Exception("an Elasticsearch instance is already running")
 
 		# don't daemonize to get the start logs inlined with those that this app generates
-		es_proc = psutil.Popen(start_script, close_fds=True, creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
+		es_proc = psutil.Popen(start_script, close_fds=True, creationflags=creationflags)
 		atexit.register(Elasticsearch._stop_es, es_proc)
 		# it takes ES a few seconds to start: don't parse output, just wait till it's online
 		waiting_since = time.time()
@@ -189,20 +192,6 @@ def _gen_passwords(self, es_dir):
 				p.stderr.read()))
 
 	def _enable_xpack(self, es_dir):
-		# start trial mode
-		url = "http://localhost:%s/_license/start_trial?acknowledge=true" % self.ES_PORT
-		failures = 0
-		while True:
-			req = requests.post(url)
-			if req.status_code == 200:
-				# TODO: check content?
-				break
-			print("starting of trial failed (#%s) with status: %s, text: %s" % (failures, req.status_code, req.text))
-			failures += 1
-			if self.ES_401_RETRIES < failures:
-				raise Exception("starting of trial failed with status: %s, text: %s" % (req.status_code, req.text))
-			time.sleep(.5)
-
 		# setup passwords to random generated ones first...
 		pwd = self._gen_passwords(es_dir)
 		# ...then change passwords, easier to restart with failed tests
@@ -216,6 +205,21 @@ def _enable_xpack(self, es_dir):
 		if req.status_code != 200:
 			print("ERROR: kibana user password change failed with code: %s" % req.status_code)
 
+		# start trial mode
+		auth = ("elastic", self.AUTH_PASSWORD)
+		url = "http://localhost:%s/_license/start_trial?acknowledge=true" % self.ES_PORT
+		failures = 0
+		while True:
+			req = requests.post(url, auth=auth, timeout=self.REQ_TIMEOUT)
+			if req.status_code == 200:
+				# TODO: check content?
+				break
+			print("starting of trial failed (#%s) with status: %s, text: %s" % (failures, req.status_code, req.text))
+			failures += 1
+			if self.ES_401_RETRIES < failures:
+				raise Exception("starting of trial failed with status: %s, text: %s" % (req.status_code, req.text))
+			time.sleep(.5)
+
 	def spawn(self, version, root_dir=None, ephemeral=False):
 		stage_dir = tempfile.mkdtemp(suffix=".ITES", dir=root_dir)
 		if ephemeral:
@@ -260,7 +264,7 @@ def is_listening(password=None):
 		auth = ("elastic", password) if password else None
 		try:
 			req = requests.get("http://localhost:%s" % Elasticsearch.ES_PORT, auth=auth, timeout=.5)
-		except requests.Timeout:
+		except (requests.Timeout, requests.ConnectionError):
 			return False
 		if req.status_code != 200:
 			if password:

test/integration/testing.py

@@ -4,7 +4,6 @@
 # you may not use this file except in compliance with the Elastic License.
 #
 
-import pyodbc
 import datetime
 import hashlib
 import unittest
@@ -31,6 +30,9 @@ def __init__(self, test_data, dsn=None):
 		self._dsn = dsn if dsn else CONNECT_STRING
 		print("Using DSN: '%s'." % self._dsn)
 
+		# only import pyODBC if running tests (vs. for instance only loading test data in ES)
+		import pyodbc
+
 	def _reconstitute_csv(self, index_name):
 		with pyodbc.connect(self._dsn) as cnxn:
 			cnxn.autocommit = True