small fixes

Author: funbringer

Dockerfile.tmpl

@@ -18,4 +18,4 @@ WORKDIR /pg/testgres
 RUN chown -R postgres:postgres /pg
 
 USER postgres
-ENTRYPOINT PYTHON=${PYTHON} /run.sh
+ENTRYPOINT PYTHON_VERSION=${PYTHON_VERSION} /run.sh

README.md

@@ -39,20 +39,31 @@ python my_tests.py
 
 ### Logging
 
-By default, `cleanup()` removes all temporary files (DB files, logs etc) that were created by testgres' API methods. If you'd like to keep logs, execute `configure_testgres(node_cleanup_full=False)` before running any tests.
+By default, `cleanup()` removes all temporary files (DB files, logs etc) that were created by testgres' API methods.
+If you'd like to keep logs, execute `configure_testgres(node_cleanup_full=False)` before running any tests.
 
-> Note: context managers (aka `with`) call `cleanup()` automatically.
+> Note: context managers (aka `with`) call `stop()` and `cleanup()` automatically.
 
-Nodes support python logging system, so if you have configured logging
-in your tests, you can use it to redirect postgres logs to yours.
-
-To do that, just use `use_logging` argument:
+testgres supports [python logging](https://docs.python.org/3.6/library/logging.html),
+which means that you can aggregate logs from several nodes into one file:
 
 ```python
-node = testgres.get_new_node('master', use_logging=True)
-```
+import io
+import logging
+
+# write everything to /tmp/testgres.log
+logfile = io.open('/tmp/testgres.log', 'w')
+logger = logging.getLogger('testgres')
+logger.FileHandler(logfile)
 
-You can find working configuration example for logging in `tests/test_simple.py`.
+# create two different nodes with logging
+node1 = testgres.get_new_node('node1', use_logging=True).init().start()
+node2 = testgres.get_new_node('node2', use_logging=True).init().start()
+
+# execute a few queries
+node1.execute('postgres', 'select 1')
+node2.execute('postgres', 'select 2')
+```
 
 
 ### Examples
@@ -81,13 +92,16 @@ or
 with testgres.get_new_node('master', '/path/to/DB') as node:
 ```
 
-where `master` is a node's name, not a DB's name. Name matters if you're testing something like replication. Function `get_new_node()` only creates directory structure in specified directory (or somewhere in '/tmp' if we did not specify base directory) for cluster. After that, we have to initialize the PostgreSQL cluster:
+where `master` is a node's name, not a DB's name. Name matters if you're testing something like replication.
+Function `get_new_node()` only creates directory structure in specified directory (or somewhere in '/tmp' if
+we did not specify base directory) for cluster. After that, we have to initialize the PostgreSQL cluster:
 
 ```python
 node.init()
 ```
 
-This function runs `initdb` command and adds some basic configuration to `postgresql.conf` and `pg_hba.conf` files. Function `init()` accepts optional parameter `allows_streaming` which configures cluster for streaming replication (default is `False`).
+This function runs `initdb` command and adds some basic configuration to `postgresql.conf` and `pg_hba.conf` files.
+Function `init()` accepts optional parameter `allows_streaming` which configures cluster for streaming replication (default is `False`).
 Now we are ready to start:
 
 ```python
@@ -126,29 +140,33 @@ It's quite easy to create a backup and start a new replica:
 with testgres.get_new_node('master') as master:
     master.init().start()
     with master.backup() as backup:
+        # create and start a new replica
         replica = backup.spawn_replica('replica').start()
-        replica.catchup()  # catch up with master
+
+        # catch up with master node
+        replica.catchup()
+
+        # execute a dummy query
         print(replica.execute('postgres', 'select 1'))
 ```
 
-> Note: you could take a look at [`pg_pathman`](https://github.com/postgrespro/pg_pathman) to get an idea of `testgres`' capabilities.
-
 ### Benchmarks
 
 `testgres` also can help you to make benchmarks using `pgbench` from postgres installation:
 
 ```python
 with testgres.get_new_node('master') as master:
-    # start new node
+    # start a new node
     master.init().start()
 
-    # initialize database for TPC-B
+    # initialize default database for TPC-B
     master.pgbench_run(options=['-i'])
 
     # run benchmark for 20 seconds and show results
     print(master.pgbench_run(options=['-T', '20']))
 ```
 
+
 ## Authors
 
 [Ildar Musin](https://github.com/zilder) <i.musin(at)postgrespro.ru> Postgres Professional Ltd., Russia     

run_tests.sh

@@ -4,19 +4,16 @@
 
 set -eux
 
-if [ "$PYTHON" == "python2" ]; then
-	VIRTUALENV="virtualenv --python=/usr/bin/python2"
-	PIP=pip2
-else
-	VIRTUALENV="virtualenv --python=/usr/bin/python3"
-	PIP=pip3
-fi
 
+# choose python version
+echo python version is $PYTHON_VERSION
+VIRTUALENV="virtualenv --python=/usr/bin/python$PYTHON_VERSION"
+PIP="pip$PYTHON_VERSION"
 
-echo check that pg_config exists
+# fail early
+echo check that pg_config is in PATH
 command -v pg_config
 
-
 # prepare environment
 VENV_PATH=/tmp/testgres_venv
 rm -rf $VENV_PATH

testgres/node.py

@@ -876,5 +876,7 @@ def connect(self, dbname='postgres', username=None):
             An instance of NodeConnection.
         """
 
-        return NodeConnection(
-            parent_node=self, dbname=dbname, username=username)
+        return NodeConnection(parent_node=self,
+                              host=self.host,
+                              dbname=dbname,
+                              username=username)

tests/README.md

@@ -22,7 +22,7 @@ export PG_BIN=/path/to/pg/bin
 ```bash
 # Set path to PostgreSQL and python version
 export PATH=$PATH:/path/to/pg/bin
-export PYTHON=3  # (or 2)
+export PYTHON_VERSION=3  # or 2
 
 # Run tests
 ./run_tests.sh