[Greater-commits] r268 - trunk/GREAT-ER-DB/impl/postgresql/test
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Jun 27 11:13:18 CEST 2011
Author: bricks
Date: 2011-06-27 11:13:18 +0200 (Mon, 27 Jun 2011)
New Revision: 268
Modified:
trunk/GREAT-ER-DB/impl/postgresql/test/postgressupport.py
Log:
Fix indentation
Modified: trunk/GREAT-ER-DB/impl/postgresql/test/postgressupport.py
===================================================================
--- trunk/GREAT-ER-DB/impl/postgresql/test/postgressupport.py 2011-06-24 12:19:54 UTC (rev 267)
+++ trunk/GREAT-ER-DB/impl/postgresql/test/postgressupport.py 2011-06-27 09:13:18 UTC (rev 268)
@@ -52,7 +52,7 @@
If outfilename is None stdout and stderr are still captured but they
are ignored and not written to any file.
"""
-# print "Executing: \n%s" % " ".join(command)
+ #print "Executing: \n%s" % " ".join(command)
proc = Popen(command, env=os.environ,
stdin=PIPE, stdout=PIPE, stderr=PIPE)
output = proc.communicate()
@@ -334,8 +334,8 @@
"""Create user username with password in the database"""
self.execute_sql("template1", "admin",
"CREATE USER %s PASSWORD '%s';" % (username,password))
- if username != "anonym_greater":
- self.execute_sql("template1", "admin", "ALTER USER %s CREATEUSER" % username)
+ if username != "anonym_greater":
+ self.execute_sql("template1", "admin", "ALTER USER %s CREATEUSER" % username)
def alter_user(self, username, password):
"""Change the user username's password in the database"""
@@ -368,16 +368,14 @@
pass
def get_connection_target(self):
- return self.dbname + "@localhost:" + str(self.server.port)
+ return self.dbname + "@localhost:" + str(self.server.port)
-
def execute_sql_file(self, file, logfile):
- run_command(["psql", "-f", file, "-d", self.dbname,
+ run_command(["psql", "-f", file, "-d", self.dbname,
"-p", str(self.server.port), "-h", self.server.host,
"-U", self.server.admin_name],
os.path.join(self.server.dbdir, logfile))
-
class PostGISDatabase:
More information about the Greater-commits
mailing list