Merge remote branch into oauth2

Author: rayluo

tests/test_client.py

@@ -48,9 +48,9 @@ def load_conf(filename):
     try:
         with open(filename) as f:
             conf = json.load(f)
-    except:
-        logger.warning("Unable to open/read JSON configuration %s" % filename)
-        raise
+    except FileNotFoundError:
+        raise unittest.SkipTest(
+            "Unable to open/read JSON configuration %s" % filename)
     openid_configuration = {}
     if "oidp" in conf:
         try: