show gtest output on failure

authserv/test/test_integration.py

@@ -39,11 +39,12 @@ class SSLServerTest(unittest.TestCase):
 
     port = 63127
 
-    ssl_ca = _relpath('testca/public/ca.pem')
-    ssl_cert = _relpath('testca/public/certs/server.pem')
+    ssl_ca = _relpath('testca/ca.pem')
+    ssl_cert = _relpath('testca/certs/server.pem')
     ssl_key = _relpath('testca/private/server.key')
-    client_cert = _relpath('testca/public/certs/client.pem')
+    client_cert = _relpath('testca/certs/client.pem')
     client_key = _relpath('testca/private/client.key')
+    dhparams = _relpath('testca/dhparams')
 
     def setUp(self):
         self.users = {
@@ -70,7 +71,7 @@ class SSLServerTest(unittest.TestCase):
         if pid == 0:
             print >>sys.stderr, 'starting server on port %d' % self.port
             ssl_ctx = ssl.create_server_context(
-                self.ssl_cert, self.ssl_key, self.ssl_ca, None)
+                self.ssl_cert, self.ssl_key, self.ssl_ca, self.dhparams)
             app.run(host='127.0.0.1', port=self.port,
                     use_reloader=False, ssl_context=ssl_ctx)
         else:
@@ -101,6 +102,13 @@ class SSLServerTest(unittest.TestCase):
         # Horrible hack: invoke the auth_client test suite.
         env = dict(os.environ)
         env['AUTH_SERVER'] = 'localhost:%d' % self.port
-        subprocess.check_call(
+        retcode = subprocess.call(
             ['make', '-C', _relpath('../../pam'), 'check'],
             env=env)
+        class _outputof(object):
+            def __init__(self, p):
+                self.path = p
+            def __str__(self):
+                with open(self.path) as fd:
+                    return fd.read()
+        self.assertEquals(retcode, 0, _outputof(_relpath('../../pam/test-suite.log')))