Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Event Hubs] Update Eventhubs conftest to use new azure-service control client #10663

Merged
merged 25 commits into from
Apr 3, 2020
Merged
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
cb13bd8
Increment version
Feb 14, 2020
38e9f65
Update Development Status
Feb 14, 2020
aa30bc0
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Feb 15, 2020
c4710ea
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Feb 20, 2020
053f073
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Feb 24, 2020
f0697f7
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 6, 2020
c83241a
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 6, 2020
18c6fba
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 6, 2020
607f134
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 9, 2020
88fd7d1
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 9, 2020
fcbaf65
Remove typing.Deque for Py3.5.3
Mar 9, 2020
f52e2d9
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 10, 2020
8aaaf1e
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 11, 2020
a12351c
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 25, 2020
c38cce4
Update more test case for pass rate
Mar 25, 2020
11e85e5
Add test method comment
Mar 25, 2020
cc9dbb9
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 27, 2020
932336a
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 30, 2020
2742ca0
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 31, 2020
561cae8
Merge branch 'master' into eventhubs_test
Mar 31, 2020
72ab463
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Apr 2, 2020
cf98683
Merge branch 'master' into eventhubs_test
Apr 2, 2020
213bb9d
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Apr 3, 2020
44a1373
Merge branch 'master' into eventhubs_test
Apr 3, 2020
5f44ba5
Update to use servicebus 7.0 control client
Apr 3, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions sdk/eventhub/azure-eventhub/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
collect_ignore.append("samples/async_samples")
collect_ignore.append("examples/async_examples")

from azure.eventhub import EventHubConsumerClient
from azure.servicebus._control_client import ServiceBusService, EventHub
from azure.eventhub import EventHubProducerClient
import uamqp
from uamqp import authentication
Expand Down Expand Up @@ -67,7 +67,6 @@ def get_logger(filename, level=logging.INFO):


def create_eventhub(eventhub_config, client=None):
from azure.servicebus.control_client import ServiceBusService, EventHub
hub_name = str(uuid.uuid4())
hub_value = EventHub(partition_count=PARTITION_COUNT)
client = client or ServiceBusService(
Expand All @@ -80,7 +79,6 @@ def create_eventhub(eventhub_config, client=None):


def cleanup_eventhub(eventhub_config, hub_name, client=None):
from azure.servicebus.control_client import ServiceBusService
client = client or ServiceBusService(
service_namespace=eventhub_config['namespace'],
shared_access_key_name=eventhub_config['key_name'],
Expand Down Expand Up @@ -108,7 +106,6 @@ def live_eventhub_config():

@pytest.fixture()
def live_eventhub(live_eventhub_config): # pylint: disable=redefined-outer-name
from azure.servicebus.control_client import ServiceBusService
client = ServiceBusService(
service_namespace=live_eventhub_config['namespace'],
shared_access_key_name=live_eventhub_config['key_name'],
Expand Down