diff --git a/litellm/tests/test_amazing_s3_logs.py b/litellm/tests/test_amazing_s3_logs.py index e010c7e59..b4dfcd542 100644 --- a/litellm/tests/test_amazing_s3_logs.py +++ b/litellm/tests/test_amazing_s3_logs.py @@ -84,13 +84,14 @@ def test_s3_logging(): # for each key, get the part before "-" as the key. Do it safely cleaned_keys = [] for key in most_recent_keys: - split_key = key.split("-time=") - cleaned_keys.append(split_key[0]) + split_key = key.split("_") + cleaned_keys.append(split_key[1]) print("\n most recent keys", most_recent_keys) print("\n cleaned keys", cleaned_keys) print("\n Expected keys: ", expected_keys) matches = 0 for key in expected_keys: + key += ".json" assert key in cleaned_keys if key in cleaned_keys: @@ -176,39 +177,6 @@ def test_s3_logging_r2(): # List objects in the bucket response = s3.list_objects(Bucket=bucket_name) - # # Sort the objects based on the LastModified timestamp - # objects = sorted( - # response["Contents"], key=lambda x: x["LastModified"], reverse=True - # ) - # # Get the keys of the most recent objects - # most_recent_keys = [obj["Key"] for obj in objects] - # print(most_recent_keys) - # # for each key, get the part before "-" as the key. Do it safely - # cleaned_keys = [] - # for key in most_recent_keys: - # split_key = key.split("-time=") - # cleaned_keys.append(split_key[0]) - # print("\n most recent keys", most_recent_keys) - # print("\n cleaned keys", cleaned_keys) - # print("\n Expected keys: ", expected_keys) - # matches = 0 - # for key in expected_keys: - # assert key in cleaned_keys - - # if key in cleaned_keys: - # matches += 1 - # # remove the match key - # cleaned_keys.remove(key) - # # this asserts we log, the first request + the 2nd cached request - # print("we had two matches ! passed ", matches) - # assert matches == 1 - # try: - # # cleanup s3 bucket in test - # for key in most_recent_keys: - # s3.delete_object(Bucket=bucket_name, Key=key) - # except: - # # don't let cleanup fail a test - # pass except Exception as e: pytest.fail(f"An exception occurred - {e}") finally: