Skip to content

Commit df08aa8

Browse files
swathipilswathipil
authored
[ServiceBus] move conftest inside tests folder (Azure#40142)
* [ServiceBus] move conftest inside tests folder * move conftest.py * move stress test_* to stress_test
1 parent 1e2b595 commit df08aa8

22 files changed

+48
-108
lines changed

‎sdk/servicebus/azure-servicebus/stress/scripts/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
TODO: README is currently a WIP and has minimal information for local testing. Need to update later.
44

55
The `stress_runner.py` file is AN EXAMPLE of how to run the tests, not the actual stress test file.
6-
The actual test files are prefixed with `test_` and `stress_test_`.
6+
The actual test files are prefixed with `stress_test_`.
77

88
## Setup for local stress test runs
99

@@ -17,5 +17,5 @@ The actual test files are prefixed with `test_` and `stress_test_`.
1717
Run the chosen test file with the following command:
1818

1919
```cmd
20-
(env) ~/azure-servicebus/stress/scripts> python test_stress_queues.py
20+
(env) ~/azure-servicebus/stress/scripts> python stress_test_queues.py
2121
```

‎sdk/servicebus/azure-servicebus/stress/scripts/conftest.py‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎sdk/servicebus/azure-servicebus/stress/scripts/stress_test_base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def __init__(
123123
self.logger = get_logger(logfile_name, "stress_test", self.logging_level, rotating_logs=self.rotating_logs)
124124
self.process_monitor = process_monitor or ProcessMonitor(
125125
"monitor_{}".format(logfile_name),
126-
"test_stress_queues",
126+
"stress_test_queues",
127127
print_console=PRINT_CONSOLE,
128128
)
129129

‎sdk/servicebus/azure-servicebus/stress/scripts/test_stress_queues.py‎ renamed to ‎sdk/servicebus/azure-servicebus/stress/scripts/stress_test_queues.py‎

File renamed without changes.

‎sdk/servicebus/azure-servicebus/stress/scripts/test_stress_queues_async.py‎ renamed to ‎sdk/servicebus/azure-servicebus/stress/scripts/stress_test_queues_async.py‎

File renamed without changes.

‎sdk/servicebus/azure-servicebus/stress/templates/testjob.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,60 +16,60 @@ spec:
1616
cpu: "1"
1717

1818
{{ if eq .Stress.testTarget "aqueuew" }}
19-
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 test_stress_queues.py --method send_receive --duration 300000 --logging-enable --debug_level Debug --transport']
19+
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 stress_test_queues.py --method send_receive --duration 300000 --logging-enable --debug_level Debug --transport']
2020
{{- end -}}
2121

2222
{{ if eq .Stress.testTarget "queuew" }}
23-
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 test_stress_queues.py --method send_receive --duration 300000 --logging-enable --debug_level Debug --transport']
23+
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 stress_test_queues.py --method send_receive --duration 300000 --logging-enable --debug_level Debug --transport']
2424
{{- end -}}
2525

2626
{{ if eq .Stress.testTarget "aqueuepullw" }}
27-
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 test_stress_queues_async.py --method send_pull_receive --duration 300000 --logging-enable --debug_level Debug --transport']
27+
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 stress_test_queues_async.py --method send_pull_receive --duration 300000 --logging-enable --debug_level Debug --transport']
2828
{{- end -}}
2929

3030
{{ if eq .Stress.testTarget "queuepullw" }}
31-
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 test_stress_queues.py --method send_pull_receive --duration 300000 --logging-enable --debug_level Debug --transport']
31+
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 stress_test_queues.py --method send_pull_receive --duration 300000 --logging-enable --debug_level Debug --transport']
3232
{{- end -}}
3333

3434
{{ if eq .Stress.testTarget "abatchw" }}
35-
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 test_stress_queues_async.py --method send_receive_batch --duration 300000 --logging-enable --debug_level Debug --transport']
35+
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 stress_test_queues_async.py --method send_receive_batch --duration 300000 --logging-enable --debug_level Debug --transport']
3636
{{- end -}}
3737

3838
{{ if eq .Stress.testTarget "batchw" }}
39-
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 test_stress_queues.py --method send_receive_batch --duration 300000 --logging-enable --debug_level Debug --transport']
39+
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 stress_test_queues.py --method send_receive_batch --duration 300000 --logging-enable --debug_level Debug --transport']
4040
{{- end -}}
4141

4242
{{ if eq .Stress.testTarget "aqueue" }}
43-
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 test_stress_queues_async.py --method send_receive --duration 300000 --logging-enable --debug_level Debug']
43+
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 stress_test_queues_async.py --method send_receive --duration 300000 --logging-enable --debug_level Debug']
4444
{{- end -}}
4545

4646
{{ if eq .Stress.testTarget "queue" }}
47-
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 test_stress_queues.py --method send_receive --duration 300000 --logging-enable --debug_level Debug']
47+
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 stress_test_queues.py --method send_receive --duration 300000 --logging-enable --debug_level Debug']
4848
{{- end -}}
4949

5050
{{ if eq .Stress.testTarget "aqueuepull" }}
51-
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 test_stress_queues_async.py --method send_pull_receive --duration 300000 --logging-enable --debug_level Debug']
51+
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 stress_test_queues_async.py --method send_pull_receive --duration 300000 --logging-enable --debug_level Debug']
5252
{{- end -}}
5353

5454
{{ if eq .Stress.testTarget "queuepull" }}
55-
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 test_stress_queues.py --method send_pull_receive --duration 300000 --logging-enable --debug_level Debug']
55+
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 stress_test_queues.py --method send_pull_receive --duration 300000 --logging-enable --debug_level Debug']
5656
{{- end -}}
5757

5858
{{ if eq .Stress.testTarget "abatch" }}
59-
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 test_stress_queues_async.py --method send_receive_batch --duration 300000 --logging-enable --debug_level Debug']
59+
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 stress_test_queues_async.py --method send_receive_batch --duration 300000 --logging-enable --debug_level Debug']
6060
{{- end -}}
6161

6262
{{ if eq .Stress.testTarget "batch" }}
63-
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 test_stress_queues.py --method send_receive_batch --duration 300000 --logging-enable --debug_level Debug ']
63+
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && python3 stress_test_queues.py --method send_receive_batch --duration 300000 --logging-enable --debug_level Debug ']
6464
{{- end -}}
6565

6666
# TODO: Running with both memray and RotatingFileHandler is resulting in a memory leak. Turn off rotating logs as a workaround to avoid the memory leak when running memray.
6767
{{ if eq .Stress.testTarget "amemray" }}
68-
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && memray run --output $DEBUG_SHARE/sb_async_memray_output.bin test_stress_queues_async.py --method send_pull_receive --duration 300000 --logging-enable --debug_level Debug --no-rotating-logs']
68+
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && memray run --output $DEBUG_SHARE/sb_async_memray_output.bin stress_test_queues_async.py --method send_pull_receive --duration 300000 --logging-enable --debug_level Debug --no-rotating-logs']
6969
{{- end -}}
7070

7171
{{ if eq .Stress.testTarget "memray" }}
72-
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && memray run --output $DEBUG_SHARE/sb_memray_output.bin test_stress_queues.py --method send_pull_receive --duration 300000 --logging-enable --debug_level Debug --no-rotating-logs']
72+
command: ['bash', '-c', 'mkdir -p $DEBUG_SHARE && memray run --output $DEBUG_SHARE/sb_memray_output.bin stress_test_queues.py --method send_pull_receive --duration 300000 --logging-enable --debug_level Debug --no-rotating-logs']
7373
{{- end -}}
7474

7575
{{- include "stress-test-addons.container-env" . | nindent 6 }}

‎sdk/servicebus/azure-servicebus/tests/async_tests/test_queues_async.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@
5959
OperationTimeoutError,
6060
)
6161
from devtools_testutils import AzureMgmtRecordedTestCase, AzureRecordedTestCase, get_credential
62-
from tests.servicebus_preparer import (
62+
from servicebus_preparer import (
6363
SERVICEBUS_ENDPOINT_SUFFIX,
6464
CachedServiceBusNamespacePreparer,
6565
CachedServiceBusQueuePreparer,
6666
ServiceBusQueuePreparer,
6767
CachedServiceBusResourceGroupPreparer,
6868
)
6969
from mocks_async import MockReceivedMessage, MockReceiver
70-
from tests.utilities import (
70+
from utilities import (
7171
get_logger,
7272
print_message,
7373
sleep_until_expired,

‎sdk/servicebus/azure-servicebus/tests/async_tests/test_sb_client_async.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
ServiceBusConnectionError,
2929
)
3030
from devtools_testutils import AzureMgmtRecordedTestCase, get_credential
31-
from tests.servicebus_preparer import (
31+
from servicebus_preparer import (
3232
CachedServiceBusNamespacePreparer,
3333
ServiceBusTopicPreparer,
3434
ServiceBusQueuePreparer,
@@ -40,7 +40,7 @@
4040
CachedServiceBusResourceGroupPreparer,
4141
SERVICEBUS_ENDPOINT_SUFFIX,
4242
)
43-
from tests.utilities import (
43+
from utilities import (
4444
get_logger,
4545
uamqp_transport as get_uamqp_transport,
4646
ArgPasserAsync,

‎sdk/servicebus/azure-servicebus/tests/async_tests/test_sessions_async.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
AutoLockRenewTimeout,
3535
)
3636
from devtools_testutils import AzureMgmtRecordedTestCase, get_credential
37-
from tests.servicebus_preparer import (
37+
from servicebus_preparer import (
3838
SERVICEBUS_ENDPOINT_SUFFIX,
3939
CachedServiceBusNamespacePreparer,
4040
CachedServiceBusQueuePreparer,
@@ -43,7 +43,7 @@
4343
ServiceBusSubscriptionPreparer,
4444
CachedServiceBusResourceGroupPreparer,
4545
)
46-
from tests.utilities import get_logger, print_message, uamqp_transport as get_uamqp_transport, ArgPasserAsync
46+
from utilities import get_logger, print_message, uamqp_transport as get_uamqp_transport, ArgPasserAsync
4747

4848
uamqp_transport_params, uamqp_transport_ids = get_uamqp_transport()
4949

‎sdk/servicebus/azure-servicebus/tests/async_tests/test_subscriptions_async.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from azure.servicebus._common.constants import ServiceBusSubQueue
2020

2121
from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, get_credential
22-
from tests.servicebus_preparer import (
22+
from servicebus_preparer import (
2323
CachedServiceBusNamespacePreparer,
2424
CachedServiceBusTopicPreparer,
2525
CachedServiceBusSubscriptionPreparer,
@@ -28,7 +28,7 @@
2828
CachedServiceBusResourceGroupPreparer,
2929
SERVICEBUS_ENDPOINT_SUFFIX,
3030
)
31-
from tests.utilities import get_logger, print_message, uamqp_transport as get_uamqp_transport, ArgPasserAsync
31+
from utilities import get_logger, print_message, uamqp_transport as get_uamqp_transport, ArgPasserAsync
3232

3333
uamqp_transport_params, uamqp_transport_ids = get_uamqp_transport()
3434

0 commit comments

Comments
 (0)