reformat code, add 'commit' arg to poll_query_until()

Author: funbringer

testgres/testgres.py

@@ -154,7 +154,7 @@ def run(self):
             # work until we're asked to stop
             while not self._stop_event.is_set():
                 # do we have new lines?
-                import select  # used only here
+                import select    # used only here
                 if fd in select.select([fd], [], [], 0)[0]:
                     for line in fd.readlines():
                         line = line.strip()
@@ -982,6 +982,7 @@ def poll_query_until(self,
                          max_attempts=0,
                          sleep_time=1,
                          expected=True,
+                         commit=True,
                          raise_programming_error=True,
                          raise_internal_error=True):
         """
@@ -1009,7 +1010,7 @@ def poll_query_until(self,
                 res = self.execute(dbname=dbname,
                                    query=query,
                                    username=username,
-                                   commit=True)
+                                   commit=commit)
 
                 if expected is None and res is None:
                     return  # done

tests/test_simple.py

@@ -360,23 +360,35 @@ def test_poll_query_until(self):
             check_time = 'select extract(epoch from now()) - {} >= 5'
 
             start_time = node.execute('postgres', get_time)[0][0]
-            node.poll_query_until('postgres', check_time.format(start_time))
+            node.poll_query_until(
+                dbname='postgres', query=check_time.format(start_time))
             end_time = node.execute('postgres', get_time)[0][0]
 
             self.assertTrue(end_time - start_time >= 5)
 
             # check 0 rows
             with self.assertRaises(QueryException):
                 node.poll_query_until(
-                    'postgres', 'select * from pg_class where true = false')
+                    dbname='postgres',
+                    query='select * from pg_class where true = false')
 
             # check 0 columns
             with self.assertRaises(QueryException):
-                node.poll_query_until('postgres',
-                                      'select from pg_class limit 1')
-            # check None
+                node.poll_query_until(
+                    dbname='postgres', query='select from pg_class limit 1')
+            # check None, fail
             with self.assertRaises(QueryException):
-                node.poll_query_until('postgres', 'create table abc (val int)')
+                node.poll_query_until(
+                    dbname='postgres', query='create table abc (val int)')
+
+            # check None, ok
+            node.poll_query_until(
+                dbname='postgres', query='create table def()',
+                expected=None)    # returns nothing
+
+            # check arbitrary expected value
+            node.poll_query_until(
+                dbname='postgres', query='select 1', expected=1)
 
             # check timeout
             with self.assertRaises(TimeoutException):