Recover all unit tests

They are either moved to new files, or made to be working after commits from master were pulled in.

Author: gordonwatts

servicex/servicex.py

@@ -107,8 +107,8 @@ def __init__(self,
 
         if not servicex_adaptor:
             # Given servicex adaptor is none, this should be ok. Fixes type checkers
-            end_point, email, password = config.get_servicex_adaptor_config(backend_type)
-            servicex_adaptor = ServiceXAdaptor(end_point, email, password)
+            end_point, token = config.get_servicex_adaptor_config(backend_type)
+            servicex_adaptor = ServiceXAdaptor(end_point, token)
         self._servicex_adaptor = servicex_adaptor
 
         if not minio_adaptor:

servicex/servicex_adaptor.py

@@ -239,4 +239,3 @@ async def trap_servicex_failures(stream: AsyncIterator[TransformTuple]) \
                                               f'processed: {processed}).')
 
         yield p
-

servicex/servicex_config.py

@@ -82,7 +82,7 @@ def find_in_list(c, key) -> Optional[str]:
         return a
 
     def get_servicex_adaptor_config(self, backend_type: Optional[str] = None) -> \
-            Tuple[str, Optional[str], Optional[str]]:
+            Tuple[str, Optional[str]]:
         '''Return the servicex (endpoint, username, email) from a given backend configuration.
 
         Args:
@@ -97,14 +97,12 @@ def get_servicex_adaptor_config(self, backend_type: Optional[str] = None) -> \
         # It is an error if this is not specified somewhere.
         endpoints = self._settings['api_endpoints']
 
-        def extract_info(ep) -> Tuple[str, Optional[str], Optional[str]]:
+        def extract_info(ep) -> Tuple[str, Optional[str]]:
             endpoint = ep['endpoint'].as_str_expanded()
-            email = ep['email'].as_str_expanded() if 'email' in ep else None
-            password = ep['password'].as_str_expanded() if 'password' in ep \
-                else None
+            token = ep['token'].as_str_expanded() if 'token' in ep else None
 
             # We can default these to "None"
-            return (endpoint, email, password)  # type: ignore
+            return (endpoint, token)  # type: ignore
 
         # If we have a good name, look for exact match
         if backend_type is not None:

tests/test_servicex.py

@@ -32,7 +32,7 @@ def test_default_ctor(mocker):
     '''
     config = mocker.MagicMock(spec=ServiceXConfigAdaptor)
     config.settings = Configuration('servicex', 'servicex')
-    config.get_servicex_adaptor_config.return_value = ('http://no-way.dude', 'j@yaol.com',
+    config.get_servicex_adaptor_config.return_value = ('http://no-way.dude',
                                                        'no_spoon_there_is')
 
     fe.ServiceXDataset('localds://dude', "uproot-ftw", config_adaptor=config)
@@ -47,7 +47,7 @@ def test_default_ctor_no_type(mocker):
     '''
     config = mocker.MagicMock(spec=ServiceXConfigAdaptor)
     config.settings = Configuration('servicex', 'servicex')
-    config.get_servicex_adaptor_config.return_value = ('http://no-way.dude', 'j@yaol.com',
+    config.get_servicex_adaptor_config.return_value = ('http://no-way.dude',
                                                        'no_spoon_there_is')
 
     fe.ServiceXDataset('localds://dude', config_adaptor=config)

tests/test_servicex_config.py

@@ -83,16 +83,14 @@ def test_sx_adaptor_settings(caplog):
         {
             'type': 'my-type',
             'endpoint': 'http://my-left-foot.com:5000',
-            'email': 'thegoodplace@example.com',
-            'password': 'forkingshirtballs',
+            'token': 'forkingshirtballs.thegoodplace.bortles'
         }
     ]
     x = ServiceXConfigAdaptor(c)
-    endpoint, email, password = x.get_servicex_adaptor_config('my-type')
+    endpoint, token = x.get_servicex_adaptor_config('my-type')
 
     assert endpoint == 'http://my-left-foot.com:5000'
-    assert email == 'thegoodplace@example.com'
-    assert password == 'forkingshirtballs'
+    assert token == 'forkingshirtballs.thegoodplace.bortles'
 
     assert len(caplog.record_tuples) == 0
 
@@ -106,16 +104,14 @@ def test_sx_adaptor_settings_no_backend_name_requested(caplog):
         {
             'type': 'my-type',
             'endpoint': 'http://my-left-foot.com:5000',
-            'email': 'thegoodplace@example.com',
-            'password': 'forkingshirtballs',
+            'token': 'forkingshirtballs.thegoodplace.bortles'
         }
     ]
     x = ServiceXConfigAdaptor(c)
-    endpoint, email, password = x.get_servicex_adaptor_config()
+    endpoint, token = x.get_servicex_adaptor_config()
 
     assert endpoint == 'http://my-left-foot.com:5000'
-    assert email == 'thegoodplace@example.com'
-    assert password == 'forkingshirtballs'
+    assert token == 'forkingshirtballs.thegoodplace.bortles'
 
     assert caplog.record_tuples[0][2] == "No backend type requested, " \
                                          "using http://my-left-foot.com:5000 - please be " \
@@ -131,16 +127,14 @@ def test_sx_adaptor_settings_no_backend_name_requested_or_listed(caplog):
     c['api_endpoints'] = [
         {
             'endpoint': 'http://my-left-foot.com:5000',
-            'email': 'thegoodplace@example.com',
-            'password': 'forkingshirtballs',
+            'token': 'forkingshirtballs.thegoodplace.bortles'
         }
     ]
     x = ServiceXConfigAdaptor(c)
-    endpoint, email, password = x.get_servicex_adaptor_config()
+    endpoint, token = x.get_servicex_adaptor_config()
 
     assert endpoint == 'http://my-left-foot.com:5000'
-    assert email == 'thegoodplace@example.com'
-    assert password == 'forkingshirtballs'
+    assert token == 'forkingshirtballs.thegoodplace.bortles'
 
     assert caplog.record_tuples[0][2] == "No backend type requested, " \
                                          "using http://my-left-foot.com:5000 - please be " \
@@ -156,16 +150,14 @@ def test_sx_adaptor_settings_backend_name_requested_with_unlabeled_type(caplog):
     c['api_endpoints'] = [
         {
             'endpoint': 'http://my-left-foot.com:5000',
-            'email': 'thegoodplace@example.com',
-            'password': 'forkingshirtballs',
+            'token': 'forkingshirtballs.thegoodplace.bortles'
         }
     ]
     x = ServiceXConfigAdaptor(c)
-    endpoint, email, password = x.get_servicex_adaptor_config('xaod')
+    endpoint, token = x.get_servicex_adaptor_config('xaod')
 
     assert endpoint == 'http://my-left-foot.com:5000'
-    assert email == 'thegoodplace@example.com'
-    assert password == 'forkingshirtballs'
+    assert token == 'forkingshirtballs.thegoodplace.bortles'
 
     assert caplog.record_tuples[0][2] == "No 'xaod' backend type found, " \
                                          "using http://my-left-foot.com:5000 - please add to " \
@@ -180,22 +172,19 @@ def test_sx_adaptor_settings_backend_name_requested_after_labeled_type(caplog):
     c['api_endpoints'] = [
         {
             'endpoint': 'http://my-left-foot.com:5000',
-            'email': 'thegoodplace@example.com',
-            'password': 'forkingshirtballs',
+            'token': 'forkingshirtballs.thegoodplace.bortles'
         },
         {
             'type': 'xaod',
             'endpoint': 'http://my-left-foot.com:5001',
-            'email': 'thegoodplace1@example.com',
-            'password': 'forkingshirtballs1',
+            'token': 'forkingshirtballs.thegoodplace.bortles1'
         }
     ]
     x = ServiceXConfigAdaptor(c)
-    endpoint, email, password = x.get_servicex_adaptor_config('xaod')
+    endpoint, token = x.get_servicex_adaptor_config('xaod')
 
     assert endpoint == 'http://my-left-foot.com:5001'
-    assert email == 'thegoodplace1@example.com'
-    assert password == 'forkingshirtballs1'
+    assert token == 'forkingshirtballs.thegoodplace.bortles1'
 
     assert len(caplog.record_tuples) == 0
 
@@ -209,21 +198,18 @@ def test_sx_adaptor_settings_backend_name_unlabeled_type():
         {
             'type': 'xaod',
             'endpoint': 'http://my-left-foot.com:5000',
-            'email': 'thegoodplace@example.com',
-            'password': 'forkingshirtballs',
+            'token': 'forkingshirtballs.thegoodplace.bortles'
         },
         {
             'endpoint': 'http://my-left-foot.com:5001',
-            'email': 'thegoodplace1@example.com',
-            'password': 'forkingshirtballs1',
+            'token': 'forkingshirtballs.thegoodplace.bortles1'
         }
     ]
     x = ServiceXConfigAdaptor(c)
-    endpoint, email, password = x.get_servicex_adaptor_config()
+    endpoint, token = x.get_servicex_adaptor_config()
 
     assert endpoint == 'http://my-left-foot.com:5001'
-    assert email == 'thegoodplace1@example.com'
-    assert password == 'forkingshirtballs1'
+    assert token == 'forkingshirtballs.thegoodplace.bortles1'
 
 
 def test_sx_adaptor_settings_wrong_type():
@@ -234,8 +220,7 @@ def test_sx_adaptor_settings_wrong_type():
         {
             'type': 'my-type',
             'endpoint': 'http://my-left-foot.com:5000',
-            'email': 'thegoodplace@example.com',
-            'password': 'forkingshirtballs',
+            'token': 'forkingshirtballs.thegoodplace.bortles'
         }
     ]
 
@@ -255,23 +240,20 @@ def test_sx_adaptor_settings_env():
         {
             'type': '${SXTYPE}',
             'endpoint': '${ENDPOINT}:5000',
-            'email': '${SXUSER}',
-            'password': '${SXPASS}',
+            'token': '${SXTOKEN}',
         }
     ]
 
     from os import environ
     environ['ENDPOINT'] = 'http://tachi.com'
-    environ['SXUSER'] = 'Holden'
-    environ['SXPASS'] = 'protomolecule'
     environ['SXTYPE'] = 'mcrn'
+    environ['SXTOKEN'] = 'protomolecule'
 
     x = ServiceXConfigAdaptor(c)
-    endpoint, email, password = x.get_servicex_adaptor_config('mcrn')
+    endpoint, token = x.get_servicex_adaptor_config('mcrn')
 
     assert endpoint == 'http://tachi.com:5000'
-    assert email == 'Holden'
-    assert password == 'protomolecule'
+    assert token == 'protomolecule'
 
 
 def test_default_config_endpoint():
@@ -280,10 +262,9 @@ def test_default_config_endpoint():
     c._add_default_source()
     x = ServiceXConfigAdaptor(c)
 
-    end_point, email, password = x.get_servicex_adaptor_config()
+    end_point, token = x.get_servicex_adaptor_config()
     assert end_point == 'http://localhost:5000'
-    assert email is None
-    assert password is None
+    assert token is None
 
 
 def test_sx_adaptor_nothing():