Move retry wrapper inside of tests

Move retry wrapper inside of test as it interferes with the pytest function definition in Python 2.7.

Author: hmstepanek

tests/agent_features/test_priority_sampling.py

@@ -26,11 +26,11 @@
 
 @override_application_settings({"event_harvest_config.harvest_limits.analytic_event_data": 1})
 @pytest.mark.parametrize("first_transaction_saved", [True, False])
-@retry(attempts=5, wait=2)  # This test is flakey so add a retry.
 def test_priority_used_in_transaction_events(first_transaction_saved):
     first_priority = 1 if first_transaction_saved else 0
     second_priority = 0 if first_transaction_saved else 1
 
+    @retry(attempts=5, wait=2)  # This test is flakey so add a retry.
     @reset_core_stats_engine()
     def _test():
         # Stats engine

tests/agent_streaming/test_infinite_tracing.py

@@ -332,7 +332,6 @@ def connect_complete():
 @conditional_decorator(
     condition=six.PY2, decorator=pytest.mark.xfail(reason="Test frequently times out on Py2.", strict=False)
 )
-@retry(attempts=5, wait=2)  # This test is flakey so add a retry.
 def test_no_data_loss_on_reconnect(mock_grpc_server, app, buffer_empty_event, batching, spans_processed_event):
     """
     Test for data loss when channel is closed by the server while waiting for more data in a request iterator.
@@ -356,6 +355,7 @@ def test_no_data_loss_on_reconnect(mock_grpc_server, app, buffer_empty_event, ba
 
     span = Span(intrinsics={}, agent_attributes={}, user_attributes={})
 
+    @retry(attempts=5, wait=2)  # This test is flakey so add a retry.
     @override_generic_settings(
         settings,
         {