@@ -1044,7 +1044,7 @@ def update_analyses_single_tool_forgiving(tool):
10441044 update_analyses_single_tool (tool )
10451045 except (jsonschema .exceptions .ValidationError , LookupError ) as e :
10461046 # syntax ensures flagging by GitHub CI
1047- raise Warning (f"WARNING: test_update_analyses[{ tool } ] failed with '{ e } ' which indicates error on tool side. Skipping test." )
1047+ print (f"WARNING: test_update_analyses[{ tool } ] failed with '{ e } ' which indicates error on tool side. Skipping test." )
10481048 return False
10491049 return True
10501050
@@ -1082,7 +1082,16 @@ def test_update_analyses(app, tool, import_id, counts, test_user, url, license):
10821082 assert is_current_user_subscribed_to_record (submission .publication_recid , user )
10831083
10841084
1085- @pytest .mark .endpoints_test
1085+ testdata_analyses_pytest_strict = list (testdata_analyses .keys ())+ ["TestAnalysis" ]
1086+ @pytest .mark .strict_endpoints_test
1087+ @pytest .mark .parametrize ("tool" , testdata_analyses_pytest_strict )
1088+ def test_update_analyses_strict (app , tool ):
1089+ """ Test update of Rivet, MadAnalyses 5, etc. analyses
1090+ Be strict about encountered errors, i.e. flag even if error is (presumably) on tool side
1091+ """
1092+ update_analyses_single_tool (tool )
1093+
1094+
10861095def test_multiupdate_analyses (app ):
10871096 """ Test update of analyses multiple times, using Rivet as example """
10881097 # Import a record that already has a Rivet analysis attached (but with '#' in the URL)
@@ -1106,7 +1115,6 @@ def test_multiupdate_analyses(app):
11061115 assert analysis_resources [0 ].file_location == 'http://rivet.hepforge.org/analyses/ATLAS_2012_I1203852'
11071116
11081117
1109- @pytest .mark .endpoints_test
11101118def test_update_delete_analyses (app ):
11111119 """ Test update and deleting of analyses, using Combine as example """
11121120 # Import a record that has an associated Combine analysis
@@ -1137,7 +1145,6 @@ def assert_err_msg(err_type, expected_msg, truncate_length=None):
11371145 assert err_msg == expected_msg
11381146
11391147
1140- @pytest .mark .endpoints_test
11411148def test_incorrect_endpoint (app ):
11421149 """ Test update_analyses with incorrect endpoint configurations """
11431150 # Call update_analyses_single_tool using an endpoint with no endpoint_url
0 commit comments