Merge "Make pgaas tests propagate test failures"

2 files changed, 9 insertions, 3 deletions

diff --git a/pgaas/pgaas/pgaas_plugin.py b/pgaas/pgaas/pgaas_plugin.py
index 73f7db6..b1625c5 100644
--- a/pgaas/pgaas/pgaas_plugin.py
+++ b/pgaas/pgaas/pgaas_plugin.py
@@ -325,7 +325,7 @@ def getpass(data, ident, hostport, dbname):
   generate the password for a given user on a specific server
   """
   m = hashlib.sha256()
-  m.update(ident)
+  m.update(ident.encode())
 
   # mix in the seed (the last line) for that database, if one exists
   hostport = hostport.lower()
@@ -336,7 +336,7 @@ def getpass(data, ident, hostport, dbname):
     with open(hostPortDbname, "r") as fp:
       for line in fp:
         lastLine = line
-    m.update(lastLine)
+    m.update(lastLine.encode())
   except IOError:
     pass
 
diff --git a/pgaas/tests/test_plugin.py b/pgaas/tests/test_plugin.py
index 0071499..10a9e10 100644
--- a/pgaas/tests/test_plugin.py
+++ b/pgaas/tests/test_plugin.py
@@ -178,6 +178,7 @@ def test_add_pgaas_cluster(monkeypatch):
   except Exception as e:
     print("Error: {0}".format(e))
     print("Stack: {0}".format(traceback.format_exc()))
+    raise
   finally:
     current_ctx.clear()
 
@@ -192,6 +193,7 @@ def test_add_database(monkeypatch):
   except Exception as e:
     print("Error: {0}".format(e))
     print("Stack: {0}".format(traceback.format_exc()))
+    raise
   finally:
     current_ctx.clear()
 
@@ -207,6 +209,7 @@ def test_bad_add_database(monkeypatch):
   except Exception as e:
     print("Error: {0}".format(e))
     print("Stack: {0}".format(traceback.format_exc()))
+    raise
   finally:
     current_ctx.clear()
 
@@ -249,10 +252,11 @@ def test_update_database(monkeypatch):
     # pylint: disable=protected-access
     mynode.properties = mynode._properties
     myctx.nodes = [mynode]
-    pgaas.pgaas_plugin.update_database(ctx=myctx, args={})
+    pgaas.pgaas_plugin.update_database(refctx=myctx)
   except Exception as e:
     print("Error: {0}".format(e))
     print("Stack: {0}".format(traceback.format_exc()))
+    raise
   finally:
     current_ctx.clear()
 
@@ -267,6 +271,7 @@ def test_delete_database(monkeypatch):
   except Exception as e:
     print("Error: {0}".format(e))
     print("Stack: {0}".format(traceback.format_exc()))
+    raise
   finally:
     current_ctx.clear()
 
@@ -281,5 +286,6 @@ def test_rm_pgaas_cluster(monkeypatch):
   except Exception as e:
     print("Error: {0}".format(e))
     print("Stack: {0}".format(traceback.format_exc()))
+    raise
   finally:
     current_ctx.clear()