Fix Issue #34.

icatproject · Apr 24, 2017 · 18ebb23 · 18ebb23
1 parent 0400958
commit 18ebb23
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/icat/client.py b/icat/client.py
@@ -174,7 +174,7 @@ def __init__(self, url, **kwargs):
         cafile = kwargs.pop('caFile', None)
         capath = kwargs.pop('caPath', None)
         if 'sslContext' in kwargs:
-            self.sslContext = kwargs.pop(['sslContext'])
+            self.sslContext = kwargs.pop('sslContext')
         else:
             self.sslContext = create_ssl_context(sslverify, cafile, capath)
 

diff --git a/tests/test_07_client_options.py b/tests/test_07_client_options.py
@@ -9,7 +9,6 @@
 from conftest import getConfig
 
 
-@pytest.mark.xfail(reason="Issue #34")
 def test_client_sslContext_kwarg(setupicat):
     """Set the `sslContext` keyword argument to the Client constructor.
     Issue #34.