rucio-clients 32.5.1__tar.gz → 32.6.0.post1__tar.gz

{rucio-clients-32.5.1 → rucio-clients-32.6.0.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rucio-clients
-Version: 32.5.1
+Version: 32.6.0.post1
 Summary: Rucio Client Lite Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio-clients-32.5.1 → rucio-clients-32.6.0.post1}/lib/rucio/common/config.py

@@ -347,7 +347,7 @@ def config_get_int(
         default=default,
         check_config_table=check_config_table,
         session=session,
-        use_cache=True,
+        use_cache=use_cache,
         expiration_time=expiration_time,
         convert_type_fnc=int,
     )
@@ -434,7 +434,7 @@ def config_get_float(
         default=default,
         check_config_table=check_config_table,
         session=session,
-        use_cache=True,
+        use_cache=use_cache,
         expiration_time=expiration_time,
         convert_type_fnc=float,
     )
@@ -521,7 +521,7 @@ def config_get_bool(
         default=default,
         check_config_table=check_config_table,
         session=session,
-        use_cache=True,
+        use_cache=use_cache,
         expiration_time=expiration_time,
         convert_type_fnc=_convert_to_boolean,
     )
@@ -608,7 +608,7 @@ def config_get_list(
         default=default,
         check_config_table=check_config_table,
         session=session,
-        use_cache=True,
+        use_cache=use_cache,
         expiration_time=expiration_time,
     )
     if isinstance(value, str):

{rucio-clients-32.5.1 → rucio-clients-32.6.0.post1}/lib/rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '32.5.1',
+    'version': '32.6.0.post1',
     'branch_nick': 'release-32-LTS',
-    'revision_id': '17edf91f8f52c22447052fc84063315fbdeb9907',
-    'revno': 12638
+    'revision_id': '5751fa31ef291f6891c6aaf6cb6871c88d15939e',
+    'revno': 12653
 }

{rucio-clients-32.5.1 → rucio-clients-32.6.0.post1}/tests/test_bad_replica.py

@@ -249,10 +249,10 @@ def test_client_add_list_bad_replicas(rse_factory, replica_client, did_client):
                     nbbadrep += 1
     assert len(replicas) == nbbadrep
 
-    # InvalidType is raised if list_rep contains a mixture of replicas and PFNs
     list_rep.extend(['srm://%s.cern.ch/test_%s/%s/%s' % (rse2_id, rse2_id, tmp_scope, generate_uuid()), ])
-    with pytest.raises(InvalidType):
-        r = replica_client.declare_bad_file_replicas(list_rep, 'This is a good reason')
+    with pytest.raises(InvalidType):    
+        # this should fail becase the replica list will now contain a mix of PFNs and dictionaries
+        replica_client.declare_bad_file_replicas(list_rep, 'This is a good reason')
 
 
 def test_client_add_suspicious_replicas(rse_factory, replica_client):

{rucio-clients-32.5.1 → rucio-clients-32.6.0.post1}/tests/test_conveyor.py

@@ -547,7 +547,7 @@ def test_multihop_receiver_on_failure(vo, did_factory, replica_client, root_acco
 @pytest.mark.parametrize("caches_mock", [{"caches_to_mock": [
     'rucio.core.rse_expression_parser.REGION',  # The list of multihop RSEs is retrieved by rse expression
 ]}], indirect=True)
-def test_multihop_receiver_on_success(vo, did_factory, root_account, caches_mock, metrics_mock, scitags_mock):
+def test_multihop_receiver_on_success(vo, did_factory, root_account, caches_mock, metrics_mock):
     """
     Verify that the receiver correctly handles successful multihop jobs
     """
@@ -566,7 +566,7 @@ def test_multihop_receiver_on_success(vo, did_factory, root_account, caches_mock
 
         did = did_factory.upload_test_file(src_rse)
         rule_priority = 5
-        rule_core.add_rule(dids=[did], account=root_account, copies=1, rse_expression=dst_rse, grouping='ALL', weight=None, lifetime=3600, locked=False, subscription_id=None, priority=rule_priority, activity='test')
+        rule_core.add_rule(dids=[did], account=root_account, copies=1, rse_expression=dst_rse, grouping='ALL', weight=None, lifetime=3600, locked=False, subscription_id=None, priority=rule_priority)
         submitter(once=True, rses=[{'id': rse_id} for rse_id in all_rses], group_bulk=2, partition_wait_time=0, transfertype='single', filter_transfertool=None)
 
         request = __wait_for_state_transition(dst_rse_id=jump_rse_id, run_poller=False, **did)
@@ -577,7 +577,6 @@ def test_multihop_receiver_on_success(vo, did_factory, root_account, caches_mock
         fts_response = FTS3Transfertool(external_host=TEST_FTS_HOST).bulk_query({request['external_id']: {request['id']: request}})
         fts_response = fts_response[request['external_id']][request['id']]
         assert fts_response.job_response['priority'] == rule_priority
-        assert fts_response.file_response['file_metadata'].get('scitags_id') is not None
 
         # Two hops; both handled by receiver
         assert metrics_mock.get_sample_value('rucio_daemons_conveyor_receiver_update_request_state_total', labels={'updated': 'True'}) >= 2
@@ -595,7 +594,7 @@ def test_multihop_receiver_on_success(vo, did_factory, root_account, caches_mock
     'rucio.core.rse_expression_parser.REGION',
     'rucio.rse.rsemanager.RSE_REGION',  # for RSE info
 ]}], indirect=True)
-def test_receiver_archiving(vo, did_factory, root_account, caches_mock):
+def test_receiver_archiving(vo, did_factory, root_account, caches_mock, scitags_mock):
     """
     Ensure that receiver doesn't mark archiving requests as DONE
     """
@@ -626,7 +625,7 @@ def test_receiver_archiving(vo, did_factory, root_account, caches_mock):
             rse_core.add_rse_attribute(dst_rse_id, 'archive_timeout', 60)
 
             did = did_factory.upload_test_file(src_rse)
-            rule_core.add_rule(dids=[did], account=root_account, copies=1, rse_expression=dst_rse, grouping='ALL', weight=None, lifetime=None, locked=False, subscription_id=None)
+            rule_core.add_rule(dids=[did], account=root_account, copies=1, rse_expression=dst_rse, grouping='ALL', weight=None, lifetime=None, locked=False, subscription_id=None, activity='test')
             submitter(once=True, rses=[{'id': rse_id} for rse_id in all_rses], group_bulk=2, partition_wait_time=0, transfertype='single', filter_transfertool=None)
 
             # Wait for the reception of the FTS Completion message for the submitted request
@@ -641,6 +640,7 @@ def test_receiver_archiving(vo, did_factory, root_account, caches_mock):
 
             # Receiver must not mark "ARCHIVING" requests as "DONE"
             request = request_core.get_request_by_did(rse_id=dst_rse_id, **did)
+            assert received_messages[request['id']].get('scitag') == 2 << 6 | 18  # 'atlas' experiment: 2; 'test' activity: 18
             assert request['state'] == RequestState.SUBMITTED
             # Poller should also correctly handle "ARCHIVING" transfers and not mark them as DONE
             poller(once=True, older_than=0, partition_wait_time=0)
@@ -660,10 +660,7 @@ def test_receiver_archiving(vo, did_factory, root_account, caches_mock):
 @pytest.mark.parametrize("file_config_mock", [{
     "overrides": [('conveyor', 'use_preparer', 'true')]
 }], indirect=True)
-@pytest.mark.parametrize("core_config_mock", [{
-    "table_content": [('throttler', 'mode', 'DEST_PER_ALL_ACT')]
-}], indirect=True)
-def test_preparer_throttler_submitter(rse_factory, did_factory, root_account, file_config_mock, core_config_mock, metrics_mock):
+def test_preparer_throttler_submitter(rse_factory, did_factory, root_account, file_config_mock, metrics_mock):
     """
     Integration test of the preparer/throttler workflow.
     """

{rucio-clients-32.5.1 → rucio-clients-32.6.0.post1}/tests/test_did.py

@@ -876,6 +876,9 @@ class TestDIDClients:
         files1 = [{'scope': scope, 'name': did_name_generator('file'), 'bytes': 1, 'adler32': '0cc737eb'} for i in range(nbfiles)]
         files2 = [{'scope': scope, 'name': did_name_generator('file'), 'bytes': 1, 'adler32': '0cc737eb'} for i in range(nbfiles)]
 
+        with pytest.raises(DataIdentifierNotFound):
+            did_client.list_content(scope, dataset1)
+
         did_client.add_dataset(scope, dataset1)
 
         with pytest.raises(DataIdentifierAlreadyExists):

{rucio-clients-32.5.1 → rucio-clients-32.6.0.post1}/tests/test_reaper.py

@@ -359,7 +359,8 @@ def test_archive_removal_impact_on_constituents(rse_factory, did_factory, mock_s
     assert len(list(did_core.list_content(**dataset1))) == 2
     with pytest.raises(DataIdentifierNotFound):
         did_core.get_did(**dataset2)
-    assert len(list(did_core.list_content(**dataset2))) == 0
+    with pytest.raises(DataIdentifierNotFound):
+        list(did_core.list_content(**dataset2))
     assert len(list(did_core.list_archive_content(**archive2))) == 0
     assert __get_archive_contents_history_count(archive1) == 4
     assert __get_archive_contents_history_count(archive2) == 3