Skip to content

Commit 0052853

Browse files
committed
Change out windows xfails
1 parent 077f8e3 commit 0052853

21 files changed

+6
-68
lines changed

tests/agent_features/conftest.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,3 @@
3434
collector_agent_registration = collector_agent_registration_fixture(
3535
app_name="Python Agent Test (agent_features)", default_settings=_default_settings
3636
)
37-
38-
FAILING_ON_WINDOWS = pytest.mark.xfail(sys.platform == "win32", reason="TODO: Fix this test on Windows")

tests/agent_features/test_async_generator_trace.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import time
1717

1818
import pytest
19-
from conftest import FAILING_ON_WINDOWS
2019
from testing_support.fixtures import capture_transaction_metrics, validate_tt_parenting
2120
from testing_support.validators.validate_transaction_errors import validate_transaction_errors
2221
from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
@@ -209,7 +208,6 @@ async def _test():
209208
event_loop.run_until_complete(_test())
210209

211210

212-
@FAILING_ON_WINDOWS
213211
@validate_tt_parenting(("TransactionNode", [("FunctionNode", [("FunctionNode", [])])]))
214212
@validate_transaction_metrics(
215213
"test_async_generator_parents",

tests/agent_features/test_attribute.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
import pytest
1616
import webtest
17-
from conftest import FAILING_ON_WINDOWS
1817
from testing_support.fixtures import (
1918
override_application_settings,
2019
validate_agent_attribute_types,
@@ -61,7 +60,6 @@ def target_wsgi_application(environ, start_response):
6160
_forgone_intrinsics = []
6261

6362

64-
@FAILING_ON_WINDOWS
6563
@validate_attributes("intrinsic", _required_intrinsics, _forgone_intrinsics)
6664
def test_intrinsics():
6765
target_application = webtest.TestApp(target_wsgi_application)
@@ -84,7 +82,6 @@ def test_intrinsics():
8482
_forgone_agent = []
8583

8684

87-
@FAILING_ON_WINDOWS
8885
@validate_attributes("agent", _required_agent, _forgone_agent)
8986
def test_agent():
9087
target_application = webtest.TestApp(target_wsgi_application)

tests/agent_features/test_attributes_in_action.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
except SyntaxError:
5252
normal_asgi_application = None
5353

54-
from conftest import FAILING_ON_WINDOWS
5554

5655
URL_PARAM = "some_key"
5756
URL_PARAM2 = "second_key"
@@ -197,7 +196,6 @@ def test_error_in_transaction_default_settings(normal_application):
197196
_expected_attributes = {"agent": TRACE_ERROR_AGENT_KEYS, "user": USER_ATTRS, "intrinsic": ["trip_id"]}
198197

199198

200-
@FAILING_ON_WINDOWS
201199
@cat_enabled
202200
@validate_transaction_trace_attributes(_expected_attributes, _expected_absent_attributes)
203201
@override_application_settings({})
@@ -265,7 +263,6 @@ def test_error_in_transaction_exclude_request_params(normal_application):
265263
_expected_attributes = {"agent": TRACE_ERROR_AGENT_KEYS, "user": USER_ATTRS, "intrinsic": ["trip_id"]}
266264

267265

268-
@FAILING_ON_WINDOWS
269266
@validate_transaction_trace_attributes(_expected_attributes, _expected_absent_attributes)
270267
@override_application_settings(_override_settings)
271268
def test_transaction_trace_exclude_request_params(normal_application):
@@ -288,7 +285,6 @@ def test_error_in_transaction_capture_params_exclude_request_params(normal_appli
288285
_override_settings = {"capture_params": True, "transaction_tracer.attributes.exclude": ["request.parameters.*"]}
289286

290287

291-
@FAILING_ON_WINDOWS
292288
@validate_transaction_trace_attributes(_expected_attributes, _expected_absent_attributes)
293289
@override_application_settings(_override_settings)
294290
def test_transaction_trace_capture_params_exclude_request_params(normal_application):
@@ -316,7 +312,6 @@ def test_error_in_transaction_include_request_params(normal_application):
316312
_expected_attributes = {"agent": AGENT_KEYS_ALL, "user": USER_ATTRS, "intrinsic": ["trip_id"]}
317313

318314

319-
@FAILING_ON_WINDOWS
320315
@validate_transaction_trace_attributes(_expected_attributes)
321316
@override_application_settings(_override_settings)
322317
def test_transaction_trace_include_request_params(normal_application):
@@ -398,7 +393,6 @@ def test_error_in_transaction_include_exclude(normal_application):
398393
}
399394

400395

401-
@FAILING_ON_WINDOWS
402396
@validate_transaction_trace_attributes(_expected_attributes, _expected_absent_attributes)
403397
@override_application_settings(_override_settings)
404398
def test_transaction_trace_include_exclude(normal_application):
@@ -473,7 +467,6 @@ def test_error_in_transaction_exclude_user_attribute(normal_application):
473467
_expected_attributes = {"agent": TRACE_ERROR_AGENT_KEYS, "user": ["sunshine"], "intrinsic": ["trip_id"]}
474468

475469

476-
@FAILING_ON_WINDOWS
477470
@validate_transaction_trace_attributes(_expected_attributes, _expected_absent_attributes)
478471
@override_application_settings(_override_settings)
479472
def test_transaction_trace_exclude_user_attribute(normal_application):
@@ -552,7 +545,6 @@ def test_error_in_transaction_exclude_agent_attribute(normal_application):
552545
}
553546

554547

555-
@FAILING_ON_WINDOWS
556548
@validate_transaction_trace_attributes(_expected_attributes, _expected_absent_attributes)
557549
@override_application_settings(_override_settings)
558550
def test_transaction_trace_exclude_agent_attribute(normal_application):
@@ -610,7 +602,6 @@ def test_error_in_transaction_deprecated_capture_params_true(normal_application)
610602
_expected_attributes = {"agent": AGENT_KEYS_ALL, "user": USER_ATTRS, "intrinsic": ["trip_id"]}
611603

612604

613-
@FAILING_ON_WINDOWS
614605
@validate_transaction_trace_attributes(_expected_attributes)
615606
@override_application_settings(_override_settings)
616607
def test_transaction_trace_deprecated_capture_params_true(normal_application):
@@ -668,7 +659,6 @@ def test_error_in_transaction_deprecated_capture_params_false(normal_application
668659
_expected_attributes = {"agent": TRACE_ERROR_AGENT_KEYS, "user": USER_ATTRS, "intrinsic": ["trip_id"]}
669660

670661

671-
@FAILING_ON_WINDOWS
672662
@validate_transaction_trace_attributes(_expected_attributes, _expected_absent_attributes)
673663
@override_application_settings(_override_settings)
674664
def test_transaction_trace_deprecated_capture_params_false(normal_application):
@@ -728,7 +718,6 @@ def test_error_in_transaction_exclude_intrinsic(normal_application):
728718
_expected_attributes = {"agent": TRACE_ERROR_AGENT_KEYS, "user": USER_ATTRS, "intrinsic": ["trip_id"]}
729719

730720

731-
@FAILING_ON_WINDOWS
732721
@validate_transaction_trace_attributes(_expected_attributes, _expected_absent_attributes)
733722
@override_application_settings(_override_settings)
734723
def test_transaction_trace_exclude_intrinsic(normal_application):
@@ -785,7 +774,6 @@ def test_error_in_transaction_attributes_disabled(normal_application):
785774
_override_settings = {"transaction_tracer.attributes.enabled": False}
786775

787776

788-
@FAILING_ON_WINDOWS
789777
@validate_transaction_trace_attributes(_expected_attributes, _expected_absent_attributes)
790778
@override_application_settings(_override_settings)
791779
def test_transaction_trace_attributes_disabled(normal_application):
@@ -843,7 +831,6 @@ def test_error_in_transaction_error_param_excluded(normal_application):
843831
_expected_attributes = {"agent": TRANS_EVENT_AGENT_KEYS, "user": USER_ATTRS, "intrinsic": []}
844832

845833

846-
@FAILING_ON_WINDOWS
847834
@validate_transaction_trace_attributes(_expected_attributes)
848835
@validate_transaction_event_attributes(_expected_attributes)
849836
@override_application_settings(_override_settings)

tests/agent_features/test_collector_payloads.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
import pytest
1616
import webtest
17-
from conftest import FAILING_ON_WINDOWS
1817
from testing_support.fixtures import override_application_settings
1918
from testing_support.sample_applications import simple_app, simple_custom_event_app, simple_exceptional_app
2019
from testing_support.validators.validate_custom_event_collector_json import validate_custom_event_collector_json
@@ -47,13 +46,11 @@ def test_error_event_json():
4746
pass
4847

4948

50-
@FAILING_ON_WINDOWS
5149
@validate_tt_collector_json()
5250
def test_transaction_trace_json():
5351
normal_application.get("/")
5452

5553

56-
@FAILING_ON_WINDOWS
5754
@validate_tt_collector_json(exclude_request_uri=True)
5855
@override_application_settings({"attributes.exclude": {"request.uri"}})
5956
def test_transaction_trace_json_no_request_uri():

tests/agent_features/test_coroutine_trace.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import time
2020

2121
import pytest
22-
from conftest import FAILING_ON_WINDOWS
2322
from testing_support.fixtures import capture_transaction_metrics, validate_tt_parenting
2423
from testing_support.validators.validate_transaction_errors import validate_transaction_errors
2524
from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
@@ -76,7 +75,6 @@ def _test():
7675
assert full_metrics[metric_key].total_call_time >= 0.2
7776

7877

79-
@FAILING_ON_WINDOWS
8078
@validate_tt_parenting(("TransactionNode", [("FunctionNode", [("FunctionNode", []), ("FunctionNode", [])])]))
8179
@validate_transaction_metrics(
8280
"test_coroutine_siblings",
@@ -248,7 +246,6 @@ def coro():
248246
gen.close()
249247

250248

251-
@FAILING_ON_WINDOWS
252249
@validate_tt_parenting(("TransactionNode", [("FunctionNode", [("FunctionNode", [])])]))
253250
@validate_transaction_metrics(
254251
"test_coroutine_parents",

tests/agent_features/test_coroutine_transaction.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import asyncio
1616

1717
import pytest
18-
from conftest import FAILING_ON_WINDOWS
1918
from testing_support.fixtures import capture_transaction_metrics, override_generic_settings
2019
from testing_support.validators.validate_transaction_errors import validate_transaction_errors
2120

@@ -91,7 +90,6 @@ async def task():
9190
test_matrix.append(native_coroutine_test)
9291

9392

94-
@FAILING_ON_WINDOWS
9593
@pytest.mark.parametrize("num_coroutines", (2,))
9694
@pytest.mark.parametrize("create_test_task", test_matrix)
9795
@pytest.mark.parametrize(

tests/agent_features/test_error_events.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import time
1717

1818
import webtest
19-
from conftest import FAILING_ON_WINDOWS
2019
from testing_support.fixtures import (
2120
cat_enabled,
2221
make_cross_agent_headers,
@@ -75,7 +74,6 @@ def test_transaction_error_event_no_extra_attributes():
7574
}
7675

7776

78-
@FAILING_ON_WINDOWS
7977
@validate_error_event_sample_data(required_attrs=_intrinsic_attributes, required_user_attrs=True)
8078
def test_transaction_error_event_lotsa_attributes():
8179
test_environ = {
@@ -99,7 +97,6 @@ def test_transaction_error_event_lotsa_attributes():
9997
}
10098

10199

102-
@FAILING_ON_WINDOWS
103100
@validate_error_event_sample_data(required_attrs=_intrinsic_attributes, required_user_attrs=True)
104101
def test_transaction_error_background_task():
105102
test_environ = {"err_message": ERR_MESSAGE, "external": "2", "db": "2", "newrelic.set_background_task": True}

tests/agent_features/test_function_trace.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
import time
1616

17-
from conftest import FAILING_ON_WINDOWS
1817
from testing_support.fixtures import validate_tt_parenting
1918
from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
2019

@@ -89,7 +88,6 @@ def test_function_trace_leading_slash_on_group():
8988
)
9089

9190

92-
@FAILING_ON_WINDOWS
9391
@validate_transaction_metrics(
9492
"test_function_trace:test_async_trace_overlapping_children",
9593
scoped_metrics=_test_async_trace_overlapping_children_scoped_metrics,

tests/agent_features/test_high_security_mode.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import pytest
1919
import webtest
20-
from conftest import FAILING_ON_WINDOWS
2120
from testing_support.fixtures import (
2221
override_application_settings,
2322
override_generic_settings,
@@ -706,7 +705,6 @@ def test_http_referrer_url_is_sanitized_in_hsm():
706705
target_application.get("/", extra_environ=environ)
707706

708707

709-
@FAILING_ON_WINDOWS
710708
@pytest.mark.parametrize("hsm_enabled", [True, False])
711709
def test_function_trace_params_dropped_in_hsm(hsm_enabled):
712710
@background_task()
@@ -724,7 +722,6 @@ def _test():
724722
_test()
725723

726724

727-
@FAILING_ON_WINDOWS
728725
@pytest.mark.parametrize("hsm_enabled", [True, False])
729726
def test_message_trace_params_dropped_in_hsm(hsm_enabled):
730727
@background_task()

0 commit comments

Comments
 (0)