Revert "Merge pull request #392 from bundlewrap/no-more-psql-exceptions"

This reverts commit d21376d, reversing
changes made to b812718.

CC #393

bundlewrap/items/postgres_dbs.py

@@ -29,25 +29,22 @@ def create_db(node, name, owner, when_creating):
 
     cmd += name
 
-    return node.run(cmd, may_fail=True)
+    return node.run(cmd)
 
 
 def drop_db(node, name):
-    return node.run("sudo -u postgres dropdb -w {}".format(quote(name)), may_fail=True)
+    return node.run("sudo -u postgres dropdb -w {}".format(quote(name)))
 
 
 def get_databases(node):
-    result = node.run("echo '\\l' | sudo -u postgres psql -Anqt -F '|' | grep '|'", may_fail=True)
-    if result.return_code != 0:
-        return {}
-
-    databases = {}
-    for line in force_text(result.stdout).strip().split("\n"):
+    output = node.run("echo '\\l' | sudo -u postgres psql -Anqt -F '|' | grep '|'").stdout
+    result = {}
+    for line in force_text(output).strip().split("\n"):
         db, owner = line.strip().split("|", 2)[:2]
-        databases[db] = {
+        result[db] = {
             'owner': owner,
         }
-    return databases
+    return result
 
 
 def set_owner(node, name, owner):
@@ -57,7 +54,6 @@ def set_owner(node, name, owner):
             name=name,
             owner=owner,
         ),
-        may_fail=True,
     )
 
 

bundlewrap/items/postgres_roles.py

@@ -16,7 +16,7 @@
 
 
 def delete_role(node, role):
-    node.run("sudo -u postgres dropuser -w {}".format(role), may_fail=True)
+    node.run("sudo -u postgres dropuser -w {}".format(role))
 
 
 def fix_role(node, role, attrs, create=False):
@@ -28,18 +28,14 @@ def fix_role(node, role, attrs, create=False):
             password="" if attrs['password_hash'] is None else password,
             role=role,
             superuser="" if attrs['superuser'] is True else "NO",
-        ),
-        may_fail=True,
+        )
     )
 
 
 def get_role(node, role):
     result = node.run("echo \"SELECT rolcanlogin, rolsuper, rolpassword from pg_authid "
                       "WHERE rolname='{}'\" "
-                      "| sudo -u postgres psql -Anqwx -F '|'".format(role),
-                      may_fail=True)
-    if result.return_code != 0:
-        return None
+                      "| sudo -u postgres psql -Anqwx -F '|'".format(role))
 
     role_attrs = {}
     for line in force_text(result.stdout).strip().split("\n"):