Sep 8, 2016 · Sep 8, 2016
diff --git a/testgres/testgres.py b/testgres/testgres.py

 importos
 importrandom
 importsocket
 #import socket
 importsubprocess
 importpwd
 importtempfile
 importshutil
 importtime
 importsix

 # Try to use psycopg2 by default. If psycopg2 isn"t available then use
 # Try to use psycopg2 by default. If psycopg2 isn"t available then use
 # pg8000 which is slower but much more portable because uses only
 # pure-Python code
 try:


 registered_nodes= []
 last_assigned_port=int(random.random()*16384)+49152;
 last_assigned_port=int(random.random()*16384)+49152
 pg_config_data= {}


 """
 Predefined exceptions
 """
 classClusterException(Exception):pass
 classQueryException(Exception):pass
 classClusterException(Exception):
 """
    Predefined exceptions
    """
 pass


 classQueryException(Exception):
 """
    Predefined exceptions
    """
 pass


 """
 Transaction wrapper returned by Node
 """
 classNodeConnection(object):
 """
    Transaction wrapper returned by Node
    """
 def__init__(self,parent_node,dbname):
 self.parent_node=parent_node

 self.connection.close()

 defbegin(self,isolation_level=0):
 levels= ['read uncommitted',
 'read committed',
 'repeatable read',
 'serializable']
 levels= ['read uncommitted',
 'read committed',
 'repeatable read',
 'serializable']

 print(type(isolation_level))
 # Check if level is int [0..3]
 ifisinstance(isolation_level,int)and \
 isolation_levelinrange(0,4):
 if(isinstance(isolation_level,int)and
 isolation_levelinrange(0,4)):

 # Replace index with isolation level type
 isolation_level=levels[isolation_level]

 # Or it might be a string
 elifisinstance(isolation_level,str)and \
 str.lower(isolation_level)inlevels:
 elif(isinstance(isolation_level,six.text_type)and
 isolation_level.lower()inlevels):

 # Nothing to do here
 pass

 @property
 defconnstr(self):
 return"port=%s"%self.port
 return"port=%s"%self.port
 # return "port=%s host=%s" % (self.port, self.host)

 defget_bin_path(self,filename):
 """ Returns full path to an executable """
 pg_config=get_config()
 ifnot"BINDIR"inpg_config:
 if"BINDIR"notinpg_config:
 returnfilename
 else:
 return"%s/%s"% (pg_config.get("BINDIR"),filename)
 """ Returns current user name """
 returnpwd.getpwuid(os.getuid())[0]


 defget_config():
 globalpg_config_data


 returnpg_config_data


 defversion_to_num(version):
 """Converts PostgreSQL version to number for easier comparison"""
 importre

 ifnotversion:
 return0
 parts=version.split(".")
 whilelen(parts)<3:parts.append("0")
 whilelen(parts)<3:
 parts.append("0")
 num=0
 forpartinparts:
 num=num*100+int(re.sub("[^\d]","",part))
 returnnum


 defget_new_node(name):
 globalregistered_nodes
 globallast_assigned_port

 returnnode


 defclean_all():
 globalregistered_nodes
 fornodeinregistered_nodes:
 node.cleanup()
 registered_nodes= []


 defstop_all():
 globalregistered_nodes
 fornodeinregistered_nodes:
diff --git a/testgres/tests/test_simple.py b/testgres/tests/test_simple.py
 importunittest
 importtime
 fromtestgresimportget_new_node,clean_all,stop_all
 # import time
 # from testgres import clean_all
 fromtestgresimportget_new_node,stop_all


 classSimpleTest(unittest.TestCase):
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,15 +23,15 @@

		importos
		importrandom
		importsocket
		#import socket
		importsubprocess
		importpwd
		importtempfile
		importshutil
		importtime
		importsix

		# Try to use psycopg2 by default. If psycopg2 isn"t available then use
		# Try to use psycopg2 by default. If psycopg2 isn"t available then use
		# pg8000 which is slower but much more portable because uses only
		# pure-Python code
		try:
Expand All		@@ -44,21 +44,28 @@


		registered_nodes= []
		last_assigned_port=int(random.random()*16384)+49152;
		last_assigned_port=int(random.random()*16384)+49152
		pg_config_data= {}


		"""
		Predefined exceptions
		"""
		classClusterException(Exception):pass
		classQueryException(Exception):pass
		classClusterException(Exception):
		"""
		Predefined exceptions
		"""
		pass


		classQueryException(Exception):
		"""
		Predefined exceptions
		"""
		pass


		"""
		Transaction wrapper returned by Node
		"""
		classNodeConnection(object):
		"""
		Transaction wrapper returned by Node
		"""
		def__init__(self,parent_node,dbname):
		self.parent_node=parent_node

Expand All		@@ -78,21 +85,22 @@ def __exit__(self, type, value, tb):
		self.connection.close()

		defbegin(self,isolation_level=0):
		levels= ['read uncommitted',
		'read committed',
		'repeatable read',
		'serializable']
		levels= ['read uncommitted',
		'read committed',
		'repeatable read',
		'serializable']

		print(type(isolation_level))
		# Check if level is int [0..3]
		ifisinstance(isolation_level,int)and \
		isolation_levelinrange(0,4):
		if(isinstance(isolation_level,int)and
		isolation_levelinrange(0,4)):

		# Replace index with isolation level type
		isolation_level=levels[isolation_level]

		# Or it might be a string
		elifisinstance(isolation_level,str)and \
		str.lower(isolation_level)inlevels:
		elif(isinstance(isolation_level,six.text_type)and
		isolation_level.lower()inlevels):

		# Nothing to do here
		pass
Expand DownExpand Up		@@ -148,13 +156,13 @@ def error_filename(self):

		@property
		defconnstr(self):
		return"port=%s"%self.port
		return"port=%s"%self.port
		# return "port=%s host=%s" % (self.port, self.host)

		defget_bin_path(self,filename):
		""" Returns full path to an executable """
		pg_config=get_config()
		ifnot"BINDIR"inpg_config:
		if"BINDIR"notinpg_config:
		returnfilename
		else:
		return"%s/%s"% (pg_config.get("BINDIR"),filename)
Expand DownExpand Up		@@ -403,6 +411,7 @@ def get_username():
		""" Returns current user name """
		returnpwd.getpwuid(os.getuid())[0]


		defget_config():
		globalpg_config_data

Expand All		@@ -422,19 +431,22 @@ def get_config():

		returnpg_config_data


		defversion_to_num(version):
		"""Converts PostgreSQL version to number for easier comparison"""
		importre

		ifnotversion:
		return0
		parts=version.split(".")
		whilelen(parts)<3:parts.append("0")
		whilelen(parts)<3:
		parts.append("0")
		num=0
		forpartinparts:
		num=num*100+int(re.sub("[^\d]","",part))
		returnnum


		defget_new_node(name):
		globalregistered_nodes
		globallast_assigned_port
Expand DownExpand Up		@@ -462,12 +474,14 @@ def get_new_node(name):

		returnnode


		defclean_all():
		globalregistered_nodes
		fornodeinregistered_nodes:
		node.cleanup()
		registered_nodes= []


		defstop_all():
		globalregistered_nodes
		fornodeinregistered_nodes:
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,8 @@
		importunittest
		importtime
		fromtestgresimportget_new_node,clean_all,stop_all
		# import time
		# from testgres import clean_all
		fromtestgresimportget_new_node,stop_all


		classSimpleTest(unittest.TestCase):

Expand Down