refactoring, fix tests, fix moron comments

Author: funbringer

run_tests.sh

@@ -5,26 +5,26 @@
 set -eux
 
 if [ "$PYTHON" == "python2" ]; then
-	virtualenv="virtualenv --python=/usr/bin/python2"
-	pip=pip2
+	VIRTUALENV="virtualenv --python=/usr/bin/python2"
+	PIP=pip2
 else
-	virtualenv="virtualenv --python=/usr/bin/python3"
-	pip=pip3
+	VIRTUALENV="virtualenv --python=/usr/bin/python3"
+	PIP=pip3
 fi
 
 # prepare environment
-cd ..
-$virtualenv env
+VENV_PATH=/tmp/testgres_venv
+rm -rf $VENV_PATH
+$VIRTUALENV $VENV_PATH
 export VIRTUAL_ENV_DISABLE_PROMPT=1
-source env/bin/activate
-cd -
+source $VENV_PATH/bin/activate
 
 # install utilities
-$pip install coverage flake8
+$PIP install coverage flake8
 
 # install testgres' dependencies
 export PYTHONPATH=$(pwd)
-$pip install .
+$PIP install .
 
 # test code quality
 flake8 .

setup.cfg

@@ -3,4 +3,4 @@ description-file = README.md
 
 [flake8]
 ignore = E501, F401, F403, F841
-exclude = .git,__pycache__
+exclude = .git,__pycache__,env,venv

testgres/testgres.py

@@ -363,7 +363,7 @@ def spawn_primary(self, name, destroy=True, use_logging=False):
         Create a primary node from a backup.
 
         Args:
-            name: name for a new node (str).
+            name: name for a new node.
             destroy: should we convert this backup into a node?
             use_logging: enable python logging.
 
@@ -392,7 +392,7 @@ def spawn_replica(self, name, destroy=True, use_logging=False):
         Create a replica of the original node from a backup.
 
         Args:
-            name: name for a new node (str).
+            name: name for a new node.
             destroy: should we convert this backup into a node?
             use_logging: enable python logging.
 
@@ -814,10 +814,10 @@ def psql(self, dbname, query=None, filename=None, username=None):
         Execute a query using psql.
 
         Args:
-            dbname: database name to connect to (str).
-            query: query to be executed (str).
-            filename: file with a query (str).
-            username: database user name (str).
+            dbname: database name to connect to.
+            query: query to be executed.
+            filename: file with a query.
+            username: database user name.
 
         Returns:
             A tuple of (code, stdout, stderr).
@@ -857,9 +857,9 @@ def safe_psql(self, dbname, query, username=None):
         Execute a query using psql.
 
         Args:
-            dbname: database name to connect to (str).
-            query: query to be executed (str).
-            username: database user name (str).
+            dbname: database name to connect to.
+            query: query to be executed.
+            username: database user name.
 
         Returns:
             psql's output as str.
@@ -875,8 +875,8 @@ def dump(self, dbname, filename=None):
         Dump database using pg_dump.
 
         Args:
-            dbname: database name to connect to (str).
-            filename: output file (str).
+            dbname: database name to connect to.
+            filename: output file.
 
         Returns:
             Path to file containing dump.
@@ -900,8 +900,8 @@ def restore(self, dbname, filename, username=None):
         Restore database from pg_dump's file.
 
         Args:
-            dbname: database name to connect to (str).
-            filename: database dump taken by pg_dump (str).
+            dbname: database name to connect to.
+            filename: database dump taken by pg_dump.
         """
 
         self.psql(dbname=dbname, filename=filename, username=username)
@@ -919,9 +919,9 @@ def poll_query_until(self,
         Run a query once a second until it returs 'expected'.
 
         Args:
-            dbname: database name to connect to (str).
-            query: query to be executed (str).
-            username: database user name (str).
+            dbname: database name to connect to.
+            query: query to be executed.
+            username: database user name.
             max_attempts: how many times should we try?
             sleep_time: how long should we sleep after a failure?
             expected: what should be returned to break the cycle?
@@ -970,9 +970,9 @@ def execute(self, dbname, query, username=None, commit=True):
         Execute a query and return all rows as list.
 
         Args:
-            dbname: database name to connect to (str).
-            query: query to be executed (str).
-            username: database user name (str).
+            dbname: database name to connect to.
+            query: query to be executed.
+            username: database user name.
             commit: should we commit this query?
 
         Returns:
@@ -990,7 +990,7 @@ def backup(self, username=None, xlog_method=DEFAULT_XLOG_METHOD):
         Perform pg_basebackup.
 
         Args:
-            username: database user name (str).
+            username: database user name.
             xlog_method: a method for collecting the logs ('fetch' | 'stream').
 
         Returns:
@@ -1008,8 +1008,8 @@ def replicate(self, name, username=None,
         Create a replica of this node.
 
         Args:
-            name: replica's name (str).
-            username: database user name (str).
+            name: replica's name.
+            username: database user name.
             xlog_method: a method for collecting the logs ('fetch' | 'stream').
             use_logging: enable python logging.
         """
@@ -1048,7 +1048,7 @@ def pgbench_init(self, dbname='postgres', scale=1, options=[]):
         Prepare database for pgbench (create tables etc).
 
         Args:
-            dbname: database name to connect to (str).
+            dbname: database name to connect to.
             scale: report this scale factor in output (int).
             options: additional options for pgbench (list).
 
@@ -1071,7 +1071,7 @@ def pgbench(self, dbname='postgres', stdout=None, stderr=None, options=[]):
         Spawn a pgbench process.
 
         Args:
-            dbname: database name to connect to (str).
+            dbname: database name to connect to.
             stdout: stdout file to be used by Popen.
             stderr: stderr file to be used by Popen.
             options: additional options for pgbench (list).
@@ -1091,8 +1091,8 @@ def connect(self, dbname='postgres', username=None):
         Connect to a database.
 
         Args:
-            dbname: database name to connect to (str).
-            username: database user name (str).
+            dbname: database name to connect to.
+            username: database user name.
 
         Returns:
             An instance of NodeConnection.
@@ -1152,9 +1152,9 @@ def _execute_utility(util, args, logfile, write_to_pipe=True):
     Execute utility (pg_ctl, pg_dump etc) using get_bin_path().
 
     Args:
-        util: utility to be executed (str).
+        util: utility to be executed.
         args: arguments for utility (list).
-        logfile: stores stdout and stderr (str).
+        logfile: path to file to store stdout and stderr.
         write_to_pipe: do we care about stdout?
 
     Returns:
@@ -1174,7 +1174,7 @@ def _execute_utility(util, args, logfile, write_to_pipe=True):
 
         # get result
         out, _ = process.communicate()
-        out = '' if not out else out.decode('utf-8')
+        out = '' if not out else six.text_type(out)
 
         # write new log entry if possible
         try:
@@ -1296,8 +1296,8 @@ def get_new_node(name, base_dir=None, use_logging=False):
     Create a new node (select port automatically).
 
     Args:
-        name: node's name (str).
-        base_dir: path to node's data directory (str).
+        name: node's name.
+        base_dir: path to node's data directory.
         use_logging: should we use custom logger?
 
     Returns:

tests/test_simple.py

@@ -336,7 +336,6 @@ def test_poll_query_until(self):
             self.assertTrue(got_exception)
 
     def test_logging(self):
-        regex = re.compile('.+?LOG:.*')
         logfile = tempfile.NamedTemporaryFile('w', delete=True)
 
         log_conf = {
@@ -362,17 +361,17 @@ def test_logging(self):
 
         logging.config.dictConfig(log_conf)
 
-        with get_new_node('master', use_logging=True) as node0, \
-            get_new_node('slave1', use_logging=True) as node1, \
-                get_new_node('slave2', use_logging=True) as node2:
+        with get_new_node('master', use_logging=True) as master:
+            master.init().start()
 
-            node0.init().start()
-            node1.init().start()
-            node2.init().start()
+            import time
+            time.sleep(0.5)
 
+            # check that master's port is found
             with open(logfile.name, 'r') as log:
-                for line in log:
-                    self.assertTrue(regex.match(line))
+                lines = log.readlines()
+                port = str(master.port)
+                self.assertTrue(any(port in s for s in lines))
 
     def test_pgbench(self):
         with get_new_node('node') as node:
@@ -403,7 +402,7 @@ def test_pg_ctl(self):
             node.init().start()
 
             status = node.pg_ctl(['status'])
-            self.assertTrue("server is running" in status)
+            self.assertTrue('PID' in status)
 
     def test_ports_management(self):
         # check that no ports have been bound yet