Testing: remove most print calls. Went from 329 to 69

Author: Joseph ORON

tests/test_bin_rucio.py

@@ -246,8 +246,7 @@ def test_create_dataset(rucio_client, mock_scope):
     tmp_name = f"{scope}:DSet_{generate_uuid()}"
     cmd = f'rucio add-dataset {tmp_name}'
     exitcode, out, err = execute(cmd)
-    print(err, out)
-    assert exitcode == 0
+    assert exitcode == 0, f"Failed to create dataset: {err} {out}"
     assert re.search('Added ' + tmp_name, out) is not None
     assert tmp_name in [f"{scope}:{did}" for did in rucio_client.list_dids(scope=scope, did_type="dataset", filters={})]
 
@@ -423,8 +422,7 @@ def test_create_rule(did_factory, rse_factory, rucio_client):
     # add rules
     cmd = f"rucio add-rule {temp_scope}:{temp_file_name} {n_replicas} 'spacetoken=ATLASSCRATCHDISK'"
     exitcode, out, err = execute(cmd)
-    print(out, err)
-    assert exitcode == 0
+    assert exitcode == 0, f"Failed to add rule: {err} {out}"
     assert "ERROR" not in err
     rule = out.split('\n')[-2]
     assert re.match(r'^\w+$', rule)
@@ -751,8 +749,7 @@ def test_set_tombstone(rse_factory, mock_scope, rucio_client):
     rucio_client.add_replica(rse, scope, name, 4, 'aaaaaaaa')
     cmd = f'rucio-admin replicas set-tombstone {scope}:{name} --rse {rse}'
     exitcode, out, err = execute(cmd)
-    print(out, err)
-    assert exitcode == 0
+    assert exitcode == 0, f"Failed to set tombstone: {err} {out}"
     assert 'Set tombstone successfully' in err
 
     # Set tombstone on locked replica
@@ -1157,8 +1154,7 @@ def test_download_metalink(rse_factory, mock_scope, did_factory, rucio_client):
             cmd = f'rucio download --legacy --dir {tmp_dir} --metalink {metalink_file.name}'
             exitcode, out, err = execute(cmd)
 
-            print(out, err)
-            assert exitcode == 0
+            assert exitcode == 0, f"Failed to download with metalink: {err} {out}"
             assert f'{tmp_file} successfully downloaded' in err
             assert re.search('Total files.*1', out) is not None
             assert os.path.exists(f"{tmp_dir}/{scope}/{tmp_file}")

tests/test_cli_client_structure.py

@@ -135,8 +135,7 @@ def test_account_attribute(jdoe_account):
 
     cmd = f"rucio account attribute list {jdoe_account}"
     exitcode, out, err = execute(cmd)
-    print(err)
-    assert exitcode == 0
+    assert exitcode == 0, f"Failed to list account attributes: {err}"
     assert "ERROR" not in err
     assert f"test_{fake_key}_key" in out
 
@@ -419,8 +418,7 @@ def test_lifetime_exception(rucio_client, mock_scope):
 
     cmd = f"rucio lifetime-exception add -f {input_file.name} --reason mock_test -x 2100-12-30"
     exitcode, _, err = execute(cmd)
-    print(err)
-    assert exitcode == 0
+    assert exitcode == 0, f"Failed to add lifetime exception: {err}"
     if "ERROR" not in err:
         assert "not affected by the lifetime model" in err
     else:
@@ -473,8 +471,7 @@ def test_replica_state(mock_scope, rucio_client):
 
     cmd = f"rucio replica state update bad {scope}:{name1} --rse {mock_rse} --reason testing"
     exitcode, _, err = execute(cmd)
-    print(err)
-    assert exitcode == 0
+    assert exitcode == 0, f"Failed to update replica state: {err}"
     if "ERROR" in err:
         assert "Details: ERROR, multiple matches" in err  # The test rses are strange. I don't know why this happens.
 
@@ -549,8 +546,7 @@ def test_rse_protocol():
     domain_json = """{"wan": {"read": 1, "write": 1, "delete": 1, "third_party_copy_read": 1, "third_party_copy_write": 1}}"""
     cmd = f"rucio rse protocol add {rse_name} --host-name blocklistreplica --scheme file --prefix /rucio --port 0 --impl rucio.rse.protocols.posix.Default --domain-json '{domain_json}'"
     exitcode, _, err = execute(cmd)
-    print(err)
-    assert "ERROR" not in err
+    assert "ERROR" not in err, f"Failed to add protocol: {err}"
     assert exitcode == 0
 
     cmd = f"rucio rse protocol remove {rse_name} --host-name blocklistreplica --scheme file"
@@ -689,8 +685,7 @@ def test_rule(rucio_client, mock_scope):
     # Testing the two different lifetime type options
     cmd = f"rucio rule update {rule_id} --lifetime 10"
     exitcode, out, err = execute(cmd)
-    print(out, err)
-    assert exitcode == 0
+    assert exitcode == 0, f"Failed to update rule lifetime: {err} {out}"
     assert "ERROR" not in err
     rule_info = rucio_client.get_replication_rule(rule_id)
     assert abs(rule_info["updated_at"] - rule_info["expires_at"]).seconds == 10
@@ -771,6 +766,5 @@ def test_subscription(rucio_client, mock_scope):
     rule = json.dumps({})
     cmd = f"rucio subscription update {subscription_name} --filter '{filter_}' --rule {rule}"
     exitcode, _, err = execute(cmd)
-    print(err)
-    assert exitcode == 0
+    assert exitcode == 0, f"Failed to update subscription: {err}"
     assert "ERROR" not in err

tests/test_clients.py

@@ -210,8 +210,7 @@ def test_import_without_config_file(self, vo):
         """
 
         exitcode, _, err = execute("python -c 'from rucio.client import Client'")
-        print(exitcode, err)
-        assert exitcode == 0
+        assert exitcode == 0, f"Failed to import Client without config file: {err}"
         assert "Could not load Rucio configuration file." not in err
 
     @pytest.mark.noparallel(reason='We temporarily remove the config file.')

tests/test_curl.py

@@ -39,29 +39,26 @@ class TestCurlRucio
     def test_ping(self):
         """PING (CURL): Get Version"""
         cmd = 'curl --cacert %s -s -X GET %s/ping' % (self.cacert, self.host)
-        print(self.marker + cmd)
         exitcode, out, err = execute(cmd)
-        print(out, )
         ret = json.loads(out)
-        assert 'version' in ret
+        assert exitcode == 0, f"Ping failed: {self.marker} {cmd}"
+        assert 'version' in ret, f"Version not found in response : {out} {ret}"
         assert isinstance(ret, dict)
 
     def test_get_auth_userpass(self):
         """AUTH (CURL): Test auth token retrieval with via username and password"""
         cmd = 'curl -s -i --cacert %s -X GET -H "X-Rucio-Account: root" -H "X-Rucio-Username: ddmlab" -H "X-Rucio-Password: secret" %s %s/auth/userpass' % (self.cacert, self.vo_header, self.auth_host)
-        print(self.marker + cmd)
         exitcode, out, err = execute(cmd)
-        print(out, )
-        assert 'X-Rucio-Auth-Token' in out
+        assert exitcode == 0, f"Auth token retrieval failed: {self.marker} {cmd}"
+        assert 'X-Rucio-Auth-Token' in out, f"Auth token not found in response: {out}"
 
     @skip_outside_gh_actions
     def test_get_auth_x509(self):
         """AUTH (CURL): Test auth token retrieval with via x509"""
         cmd = 'curl -s -i --cacert %s -H "X-Rucio-Account: root" %s -cert %s --key %s -X GET %s/auth/x509' % (self.cacert, self.vo_header, self.usercert, self.userkey, self.auth_host)
-        print(self.marker + cmd)
         exitcode, out, err = execute(cmd)
-        print(out, )
-        assert 'X-Rucio-Auth-Token' in out
+        assert exitcode == 0, f"Auth token retrieval failed: {self.marker} {cmd}"
+        assert 'X-Rucio-Auth-Token' in out, f"Auth token not found in response: {out}"
 
     def test_get_auth_gss(self):
         """AUTH (CURL): Test auth token retrieval with via gss"""
@@ -95,10 +92,9 @@ def test_get_auth_validate(self):
         assert 'X-Rucio-Auth-Token' in out
         os.environ['RUCIO_TOKEN'] = out[len('X-Rucio-Auth-Token: '):].rstrip()
         cmd = 'curl -s -i --cacert %s  -H "X-Rucio-Auth-Token: $RUCIO_TOKEN" -X GET %s/auth/validate' % (self.cacert, self.auth_host)
-        print(self.marker + cmd)
         exitcode, out, err = execute(cmd)
-        print(out)
-        assert 'datetime.datetime' in out
+        assert exitcode == 0, f"Token validation failed: {self.marker} {cmd}"
+        assert 'datetime.datetime' in out, f"Token validation failed: {out}"
 
     @skip_outside_gh_actions
     @pytest.mark.dirty
@@ -116,25 +112,22 @@ def test_post_account(self):
                "-d '{\"type\": \"USER\", \"email\": \"[email protected]\"}' "
                "-X POST %s/accounts/%s"
                ) % (self.cacert, self.host, account_name_generator())
-
-        print(self.marker + cmd)
         exitcode, out, err = execute(cmd)
-        print(out)
-        assert '201 Created'.lower() in out.lower()
+        assert exitcode == 0, f"Account creation failed: {self.marker} {cmd}"
+        assert '201 Created'.lower() in out.lower(), f"Account creation failed: {out}"
 
     @skip_outside_gh_actions
     def test_get_accounts_whoami(self):
         """ACCOUNT (CURL): Test whoami method"""
         cmd = 'curl -s -i --cacert %s -H "X-Rucio-Account: root" %s --cert %s --key %s -X GET %s/auth/x509 | tr -d \'\r\' | grep X-Rucio-Auth-Token:' % (self.cacert, self.vo_header, self.usercert, self.userkey, self.auth_host)
-        print(cmd)
         exitcode, out, err = execute(cmd)
-        assert 'X-Rucio-Auth-Token' in out
+        assert exitcode == 0, f"Auth token retrieval failed: {cmd}"
+        assert 'X-Rucio-Auth-Token' in out, f"Auth token not found in response: {out}"
         os.environ['RUCIO_TOKEN'] = out[len('X-Rucio-Auth-Token: '):].rstrip()
         cmd = '''curl -s -i -L --cacert %s -H "X-Rucio-Auth-Token: $RUCIO_TOKEN" -X GET %s/accounts/whoami''' % (self.cacert, self.host)
-        print(self.marker + cmd)
         exitcode, out, err = execute(cmd)
-        print(out)
-        assert '303 See Other'.lower() in out.lower()
+        assert exitcode == 0, f"Whoami failed: {self.marker} {cmd}"
+        assert '303 See Other'.lower() in out.lower(), f"Whoami failed: {out}"
 
     @skip_outside_gh_actions
     @pytest.mark.dirty
@@ -145,7 +138,6 @@ def test_post_rse(self):
         assert 'X-Rucio-Auth-Token' in out
         os.environ['RUCIO_TOKEN'] = out[len('X-Rucio-Auth-Token: '):].rstrip()
         cmd = '''curl -s -i --cacert %s -H "X-Rucio-Auth-Token: $RUCIO_TOKEN" -X POST %s/rses/%s''' % (self.cacert, self.host, rse_name_generator())
-        print(self.marker + cmd)
         exitcode, out, err = execute(cmd)
-        print(out)
-        assert '201 Created'.lower() in out.lower()
+        assert exitcode == 0, f"RSE creation failed: {self.marker} {cmd}"
+        assert '201 Created'.lower() in out.lower(), f"RSE creation failed: {out}"

tests/test_did.py

@@ -1260,20 +1260,19 @@ def test_list_by_length(vo, root_account, rse_factory, mock_scope, did_factory,
     results = []
     for d in dids:
         results.append(d)
-    print(results)
-    assert len(results) != 0
+    assert len(results) != 0, "No DIDs found with length > 0"
 
     dids = did_client.list_dids(tmp_scope, {'length.gt': -1, 'length.lt': 1})
     results = []
     for d in dids:
         results.append(d)
-    assert len(results) == 0
+    assert len(results) == 0, "DIDs found with length > -1 and < 1"
 
     dids = did_client.list_dids(tmp_scope, {'length': 0})
     results = []
     for d in dids:
         results.append(d)
-    assert len(results) == 0
+    assert len(results) == 0, "DIDs found with length = 0"
 
 
 @pytest.mark.dirty

tests/test_did_meta_plugins.py

@@ -736,9 +736,8 @@ def test_did_set_metadata_bulk_single(testdid):
 
     set_metadata_bulk(meta=testmeta, recursive=False, **testdid)
     meta = get_metadata(plugin="ALL", **testdid)
-    print('Metadata:', meta)
 
-    assert testkey in meta and meta[testkey] == testmeta[testkey]
+    assert testkey in meta and meta[testkey] == testmeta[testkey], f"Expected {testkey} to be {testmeta[testkey]}, but got {meta[testkey]}"
 
 
 def test_did_set_metadata_bulk_multi(testdid):
@@ -752,10 +751,9 @@ def test_did_set_metadata_bulk_multi(testdid):
 
     set_metadata_bulk(meta=testmeta, recursive=False, **testdid)
     meta = get_metadata(plugin="ALL", **testdid)
-    print('Metadata:', meta)
 
     for testkey in testkeys:
-        assert testkey in meta and meta[testkey] == testmeta[testkey]
+        assert testkey in meta and meta[testkey] == testmeta[testkey], f"Expected {testkey} to be {testmeta[testkey]}, but got {meta[testkey]}"
 
 
 def test_set_dids_metadata_bulk_multi(did_factory):
@@ -773,11 +771,9 @@ def test_set_dids_metadata_bulk_multi(did_factory):
     set_dids_metadata_bulk(dids=dids, recursive=False)
     for did in dids:
         testmeta = did['meta']
-        print('Metadata:', testmeta)
         meta = get_metadata(plugin="ALL", scope=did['scope'], name=did['name'])
-        print('Metadata:', meta)
         for testkey in testmeta:
-            assert testkey in meta and meta[testkey] == testmeta[testkey]
+            assert testkey in meta and meta[testkey] == testmeta[testkey], f"Expected {testkey} to be {testmeta[testkey]}, but got {meta[testkey]}"
 
 
 def test_did_set_metadata_bulk_multi_client(testdid):
@@ -796,10 +792,9 @@ def test_did_set_metadata_bulk_multi_client(testdid):
     assert result is True
 
     meta = get_metadata(plugin="ALL", **testdid)
-    print('Metadata:', meta)
 
     for testkey in testkeys:
-        assert testkey in meta and meta[testkey] == testmeta[testkey]
+        assert testkey in meta and meta[testkey] == testmeta[testkey], f"Expected {testkey} to be {testmeta[testkey]}, but got {meta[testkey]}"
 
 
 def test_set_dids_metadata_bulk_multi_client(did_factory, rucio_client):
@@ -823,8 +818,6 @@ def test_set_dids_metadata_bulk_multi_client(did_factory, rucio_client):
 
     for did in dids:
         testmeta = did['meta']
-        print('Metadata:', testmeta)
         meta = get_metadata(plugin="ALL", scope=did['scope'], name=did['name'])
-        print('Metadata:', meta)
         for testkey in testmeta:
-            assert testkey in meta and meta[testkey] == testmeta[testkey]
+            assert testkey in meta and meta[testkey] == testmeta[testkey], f"Expected {testkey} to be {testmeta[testkey]}, but got {meta[testkey]}"

tests/test_download.py

@@ -519,8 +519,7 @@ def test_disable_no_files_download_error(vo, rse_factory, did_factory, download_
     rse, _ = rse_factory.make_posix_rse()
     with TemporaryDirectory() as tmp_dir:
         res = download_client.download_dids([{'did': 'some:randomNonExistingDid', 'base_dir': tmp_dir}], deactivate_file_download_exceptions=True)
-        print('Downloaded object', res)
-        assert res[0]['clientState'] == 'FILE_NOT_FOUND'
+        assert res[0]['clientState'] == 'FILE_NOT_FOUND', 'Expected FILE_NOT_FOUND state, got %s' % res[0]['clientState']
 
 
 def test_nrandom_respected(rse_factory, did_factory, download_client, root_account):

tests/test_gateway_external_representation.py

@@ -383,8 +383,7 @@ def test_gateway_rse(self, vo, rse_factory, vo2, account, account_name, scope_na
         abacus_rse.run(once=True)
 
         out = gateway_rse.get_rse_usage(rse_mock, per_account=True, issuer='root', vo=vo)
-        print(out)
-        assert rse_mock_id in [o['rse_id'] for o in out]
+        assert rse_mock_id in [o['rse_id'] for o in out], f"RSE ID not found in usage output: {out}"
         for usage in out:
             if usage['rse_id'] == rse_mock_id:
                 assert usage['rse'] == rse_mock

tests/test_hermes.py

@@ -248,9 +248,8 @@ def test_hermes(core_config_mock, caches_mock, monkeypatch):
     response = requests.post(
         "http://localhost:9200/_search?size=1000", data=data, headers=headers
     )
-    assert response.status_code == 200
+    assert response.status_code == 200, f"Response status code should be 200, got {response.status_code}"
     res = response.json()
-    print(res)
     elastic_messages = []
     for entry in res["hits"]["hits"]:
         message = entry["_source"]
@@ -265,7 +264,7 @@ def test_hermes(core_config_mock, caches_mock, monkeypatch):
             }
         )
     for message in list_messages:
-        assert message in elastic_messages
+        assert message in elastic_messages, f"Message {message} not found in elastic messages, res = {res}"
 
     # Checking ActiveMQ
     assert service_dict["activemq"] == 0