Merge commit 'v0.8.0'; branch 'v0.8'

James William Pye · James William Pye · commit c5602f16741a · 2009-04-21T03:14:44.000-07:00
diff --git a/postgresql/cluster.py b/postgresql/cluster.py
@@ -386,7 +386,15 @@ def running(self):
 		"""
 		if self.daemon_process is not None:
 			r = self.daemon_process.poll()
-			return r is None
+			if r is not None:
+				pid = self.get_pid_from_file()
+				if pid is not None:
+					# daemon process does not exist, but there's a pidfile.
+					self.daemon_process = None
+					return self.running()
+				return False
+			else:
+				return True
 		else:
 			pid = self.get_pid_from_file()
 			if pid is None:
diff --git a/postgresql/documentation/driver.py b/postgresql/documentation/driver.py
@@ -332,7 +332,7 @@
  ``db.execute(sql_statements_string)``
   Run a block of SQL on the server. This method returns `None` unless an error
   occurs. If errors occur, the processing of the statements will stop and the
-  the error will be raised.
+  error will be raised.
 
  ``db.xact(gid = None, isolation = None, mode = None)``
   The `postgresql.api.Transaction` constructor for creating transactions.
diff --git a/postgresql/test/test_cluster.py b/postgresql/test/test_cluster.py
@@ -25,16 +25,23 @@ def tearDown(self):
 
 	def start_cluster(self):
 		self.cluster.start(logfile = None)
-		self.cluster.wait_until_started(timeout = 30)
+		self.cluster.wait_until_started(timeout = 10)
 
 	def init(self, *args, **kw):
 		self.cluster.init(*args, **kw)
 		self.cluster.settings.update({
 			'max_connections' : '8',
 			'listen_addresses' : 'localhost',
-			'port' : '6543'
+			'port' : '6543',
+			'silent_mode' : 'off',
 		})
 
+	def testSilentMode(self):
+		self.init(logfile = None)
+		self.cluster.settings['silent_mode'] = 'on'
+		# if it fails to start(ClusterError), silent_mode is not working properly.
+		self.start_cluster()
+
 	def testSuperPassword(self):
 		self.init(
 			user = 'test',
diff --git a/postgresql/unittest.py b/postgresql/unittest.py
@@ -54,6 +54,7 @@ def configure_cluster(self):
 			listen_addresses = 'localhost',
 			log_destination = 'stderr',
 			log_min_messages = 'FATAL',
+			silent_mode = 'off',
 		))
 
 	def initialize_database(self):
