Skip to content

Commit

Permalink
ref: remove/replace calls to iso_format(...) in relay / symbolicator …
Browse files Browse the repository at this point in the history
…tests (#79060)

automated using
#78931 (comment)

<!-- Describe your PR here. -->
  • Loading branch information
asottile-sentry authored Oct 16, 2024
1 parent ba4be16 commit 8158cf8
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 35 deletions.
28 changes: 14 additions & 14 deletions tests/relay_integration/lang/java/test_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from sentry.models.debugfile import ProjectDebugFile
from sentry.models.files.file import File
from sentry.testutils.cases import TransactionTestCase
from sentry.testutils.helpers.datetime import before_now, iso_format
from sentry.testutils.helpers.datetime import before_now
from sentry.testutils.relay import RelayStoreHelper
from sentry.testutils.skips import requires_symbolicator
from sentry.utils import json
Expand Down Expand Up @@ -469,7 +469,7 @@ def test_basic_resolving(self):
}
]
},
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1).isoformat(),
}

event = self.post_and_retrieve_event(event_data)
Expand Down Expand Up @@ -543,7 +543,7 @@ def test_resolving_does_not_fail_when_no_value(self):
}
]
},
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1).isoformat(),
}

event = self.post_and_retrieve_event(event_data)
Expand Down Expand Up @@ -613,7 +613,7 @@ def test_resolving_does_not_fail_when_no_module_or_function(self):
}
]
},
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1).isoformat(),
}

event = self.post_and_retrieve_event(event_data)
Expand Down Expand Up @@ -702,7 +702,7 @@ def test_sets_inapp_after_resolving(self):
}
]
},
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1).isoformat(),
}

event = self.post_and_retrieve_event(event_data)
Expand Down Expand Up @@ -769,7 +769,7 @@ def test_resolving_inline(self):
}
]
},
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1).isoformat(),
}

event = self.post_and_retrieve_event(event_data)
Expand Down Expand Up @@ -864,7 +864,7 @@ def test_resolving_inline_with_native_frames(self):
}
]
},
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1).isoformat(),
}

event = self.post_and_retrieve_event(event_data)
Expand Down Expand Up @@ -970,7 +970,7 @@ def test_error_on_resolving(self):
}
]
},
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1).isoformat(),
}

event = self.post_and_retrieve_event(event_data)
Expand Down Expand Up @@ -1087,7 +1087,7 @@ def test_basic_source_lookup(self):
}
]
},
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1).isoformat(),
}

event = self.post_and_retrieve_event(event_data)
Expand Down Expand Up @@ -1405,7 +1405,7 @@ def test_source_lookup_with_proguard(self):
}
]
},
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1).isoformat(),
}

event = self.post_and_retrieve_event(event_data)
Expand Down Expand Up @@ -1540,7 +1540,7 @@ def test_invalid_exception(self):
{"type": "RemoteException", "module": "android.os"},
]
},
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1).isoformat(),
}

event = self.post_and_retrieve_event(event_data)
Expand Down Expand Up @@ -1583,7 +1583,7 @@ def test_is_jvm_event(self):
}
]
},
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1),
}
assert is_jvm_event(event)

Expand Down Expand Up @@ -1612,7 +1612,7 @@ def test_is_jvm_event(self):
}
]
},
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1),
}
# has no platform
assert is_jvm_event(event)
Expand Down Expand Up @@ -1643,7 +1643,7 @@ def test_is_jvm_event(self):
}
]
},
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1),
}
# has no modules
assert not is_jvm_event(event)
4 changes: 2 additions & 2 deletions tests/relay_integration/lang/javascript/test_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from sentry.models.files.file import File
from sentry.models.release import Release
from sentry.models.releasefile import ReleaseFile
from sentry.testutils.helpers.datetime import before_now, iso_format
from sentry.testutils.helpers.datetime import before_now
from sentry.testutils.pytest.fixtures import django_db_all
from sentry.testutils.relay import RelayStoreHelper
from sentry.testutils.skips import requires_kafka, requires_symbolicator
Expand Down Expand Up @@ -71,7 +71,7 @@ def test_sourcemap_expansion(self):
)

data = {
"timestamp": iso_format(before_now(minutes=1)),
"timestamp": before_now(minutes=1).isoformat(),
"message": "hello",
"platform": "javascript",
"release": "abc",
Expand Down
4 changes: 2 additions & 2 deletions tests/relay_integration/lang/javascript/test_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from sentry.models.release import Release
from sentry.models.releasefile import ReleaseFile, update_artifact_index
from sentry.tasks.assemble import assemble_artifacts
from sentry.testutils.helpers.datetime import before_now, iso_format
from sentry.testutils.helpers.datetime import before_now
from sentry.testutils.pytest.fixtures import django_db_all
from sentry.testutils.relay import RelayStoreHelper
from sentry.testutils.skips import requires_kafka, requires_symbolicator
Expand Down Expand Up @@ -111,7 +111,7 @@ def initialize(self, default_projectkey, default_project, set_sentry_option, liv
self.project = default_project
self.projectkey = default_projectkey
self.organization = self.project.organization
self.min_ago = iso_format(before_now(minutes=1))
self.min_ago = before_now(minutes=1).isoformat()
# We disable scraping per-test when necessary.
self.project.update_option("sentry:scrape_javascript", True)

Expand Down
10 changes: 5 additions & 5 deletions tests/relay_integration/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from sentry.models.eventattachment import EventAttachment
from sentry.tasks.relay import invalidate_project_config
from sentry.testutils.cases import TransactionTestCase
from sentry.testutils.helpers.datetime import before_now, iso_format, timestamp_format
from sentry.testutils.helpers.datetime import before_now, timestamp_format
from sentry.testutils.relay import RelayStoreHelper
from sentry.testutils.skips import requires_kafka

Expand All @@ -17,7 +17,7 @@
class SentryRemoteTest(RelayStoreHelper, TransactionTestCase):
# used to be test_ungzipped_data
def test_simple_data(self):
event_data = {"message": "hello", "timestamp": iso_format(before_now(seconds=1))}
event_data = {"message": "hello", "timestamp": before_now(seconds=1).isoformat()}
event = self.post_and_retrieve_event(event_data)
assert event.message == "hello"

Expand Down Expand Up @@ -143,8 +143,8 @@ def test_transaction(self):
"event_id": "d2132d31b39445f1938d7e21b6bf0ec4",
"type": "transaction",
"transaction": "/organizations/:orgId/performance/:eventSlug/",
"start_timestamp": iso_format(before_now(minutes=1, milliseconds=500)),
"timestamp": iso_format(before_now(minutes=1)),
"start_timestamp": before_now(minutes=1, milliseconds=500).isoformat(),
"timestamp": before_now(minutes=1).isoformat(),
"contexts": {
"trace": {
"trace_id": "ff62a8b040f340bda5d830223def1d81",
Expand Down Expand Up @@ -234,6 +234,6 @@ def test_project_config_compression(self):
with mock.patch(
"sentry.api.endpoints.relay.project_configs.RelayProjectConfigsEndpoint.post"
):
event_data = {"message": "hello", "timestamp": iso_format(before_now(seconds=1))}
event_data = {"message": "hello", "timestamp": before_now(seconds=1)}
event = self.post_and_retrieve_event(event_data)
assert event.message == "hello"
14 changes: 7 additions & 7 deletions tests/relay_integration/test_metrics_extraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from sentry.sentry_metrics.indexer.strings import SHARED_STRINGS
from sentry.testutils.cases import TransactionTestCase
from sentry.testutils.helpers.datetime import before_now, iso_format
from sentry.testutils.helpers.datetime import before_now
from sentry.testutils.helpers.features import Feature
from sentry.testutils.helpers.options import override_options
from sentry.testutils.relay import RelayStoreHelper
Expand All @@ -29,8 +29,8 @@ def test_all_transaction_metrics_emitted(self):
"type": "transaction",
"transaction": "foo",
"transaction_info": {"source": "url"}, # 'transaction' tag not extracted
"timestamp": iso_format(before_now(seconds=1)),
"start_timestamp": iso_format(before_now(seconds=2)),
"timestamp": before_now(seconds=1),
"start_timestamp": before_now(seconds=2),
"contexts": {
"trace": {
"trace_id": 32 * "b",
Expand Down Expand Up @@ -62,8 +62,8 @@ def test_all_transaction_metrics_emitted(self):
"op": op,
"trace_id": 32 * "b",
"span_id": 16 * "1",
"start_timestamp": iso_format(before_now(seconds=2)),
"timestamp": iso_format(before_now(seconds=1)),
"start_timestamp": before_now(seconds=2),
"timestamp": before_now(seconds=1),
}
for op in ("db", "http", "resource", "browser", "ui")
],
Expand Down Expand Up @@ -118,8 +118,8 @@ def test_histogram_outliers(self):
"type": "transaction",
"transaction": "foo",
"transaction_info": {"source": "url"}, # 'transaction' tag not extracted
"timestamp": iso_format(before_now(seconds=1)),
"start_timestamp": iso_format(before_now(seconds=2)),
"timestamp": before_now(seconds=1).isoformat(),
"start_timestamp": before_now(seconds=2).isoformat(),
"platform": "javascript",
"contexts": {
"trace": {
Expand Down
10 changes: 5 additions & 5 deletions tests/symbolicator/test_payload_full.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from sentry.models.files.file import File
from sentry.testutils.cases import TransactionTestCase
from sentry.testutils.factories import get_fixture_path
from sentry.testutils.helpers.datetime import before_now, iso_format
from sentry.testutils.helpers.datetime import before_now
from sentry.testutils.relay import RelayStoreHelper
from sentry.testutils.skips import requires_kafka, requires_symbolicator
from sentry.utils import json
Expand Down Expand Up @@ -73,7 +73,7 @@
}
]
},
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1).isoformat(),
}


Expand All @@ -90,7 +90,7 @@ class SymbolicatorResolvingIntegrationTest(RelayStoreHelper, TransactionTestCase
@pytest.fixture(autouse=True)
def initialize(self, live_server):
self.project.update_option("sentry:builtin_symbol_sources", [])
self.min_ago = iso_format(before_now(minutes=1))
self.min_ago = before_now(minutes=1).isoformat()

with patch("sentry.auth.system.is_internal_ip", return_value=True), self.options(
{"system.url-prefix": live_server.url}
Expand Down Expand Up @@ -189,7 +189,7 @@ def test_debug_id_resolving(self):
"value": "Fatal Error: EXCEPTION_ACCESS_VIOLATION_WRITE",
},
"platform": "native",
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1).isoformat(),
}

event = self.post_and_retrieve_event(event_data)
Expand Down Expand Up @@ -266,7 +266,7 @@ def test_resolving_with_candidates_sentry_source(self):
"value": "Fatal Error: EXCEPTION_ACCESS_VIOLATION_WRITE",
},
"platform": "native",
"timestamp": iso_format(before_now(seconds=1)),
"timestamp": before_now(seconds=1).isoformat(),
}

event = self.post_and_retrieve_event(event_data)
Expand Down

0 comments on commit 8158cf8

Please sign in to comment.