Skip to content

test fixes #2357

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.

Sign up for GitHub

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

Merged
lmazuel merged 9 commits into from
Apr 24, 2018
Merged

test fixes #2357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d2f205b
Generated from 53d1a0f7b7527828b2cdec46ed4fe3af768b11f4 (#1946)
AutorestCI Feb 22, 2018
c110662
Merge branch 'master' into restapi_auto_servicebus/resource-manager
lmazuel Feb 22, 2018
8e95948
Generated from eb292024b547ba2920c6cbe2231e8ee44a2c71ef (#2049)
AutorestCI Feb 23, 2018
3dca91c
Fix double azure-common install that breaks bdist_wheel
lmazuel Feb 28, 2018
d64d446
Generated from bc96045bf6a0e056903d0a2d798202ff9bd05165 (#2249)
AutorestCI Mar 23, 2018
8d98f4c
Generated from cb47714a72869d9271ef4a750f5997d4d070aaf2 (#2282)
AutorestCI Mar 26, 2018
a8e1ca1
Update version.py
lmazuel Apr 4, 2018
b8617eb
Merge branch 'restapi_auto_servicebus/resource-manager' of https://gi…
Apr 20, 2018
65fca82
Updated Tests
Apr 21, 2018
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
13 changes: 7 additions & 6 deletions ...dings/test_azure_mgmt_servicebus_check_name_availability.test_sb_namespace_available.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ interactions:
Connection: [keep-alive]
Content-Length: ['44']
Content-Type: [application/json; charset=utf-8]
User-Agent: [python/3.6.3 (Windows-10-10.0.15063-SP0) requests/2.18.4 msrest/0.4.17
msrest_azure/0.4.15 servicebusmanagementclient/0.3.0 Azure-SDK-For-Python]
User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.27
msrest_azure/0.4.25 azure-mgmt-servicebus/0.5.0 Azure-SDK-For-Python]
accept-language: [en-US]
method: POST
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceBus/CheckNameAvailability?api-version=2017-04-01
Expand All @@ -18,14 +18,15 @@ interactions:
cache-control: [no-cache]
content-length: ['53']
content-type: [application/json; charset=utf-8]
date: ['Wed, 01 Nov 2017 01:28:18 GMT']
date: ['Sat, 21 Apr 2018 00:30:31 GMT']
expires: ['-1']
pragma: [no-cache]
server: [Service-Bus-Resource-Provider/SN1, Microsoft-HTTPAPI/2.0]
server-sb: [Service-Bus-Resource-Provider/SN1]
server: [Service-Bus-Resource-Provider/CH3, Microsoft-HTTPAPI/2.0]
server-sb: [Service-Bus-Resource-Provider/CH3]
strict-transport-security: [max-age=31536000; includeSubDomains]
transfer-encoding: [chunked]
vary: [Accept-Encoding]
x-ms-ratelimit-remaining-subscription-writes: ['1196']
x-content-type-options: [nosniff]
x-ms-ratelimit-remaining-subscription-writes: ['1199']
status: {code: 200, message: OK}
version: 1
1,370 changes: 1,241 additions & 129 deletions ...vicebus/tests/recordings/test_azure_mgmt_servicebus_namespace.test_sb_namespace_curd.yaml
View file
Open in desktop

Large diffs are not rendered by default.

296 changes: 154 additions & 142 deletions ...mgmt-servicebus/tests/recordings/test_azure_mgmt_servicebus_queue.test_sb_queue_curd.yaml
View file
Open in desktop

Large diffs are not rendered by default.

294 changes: 153 additions & 141 deletions ...mgmt-servicebus/tests/recordings/test_azure_mgmt_servicebus_topic.test_sb_topic_curd.yaml
View file
Open in desktop

Large diffs are not rendered by default.

234 changes: 120 additions & 114 deletions ...s/recordings/test_azure_mgmt_servicebus_topic_subscription.test_sb_subscription_curd.yaml
View file
Open in desktop

Large diffs are not rendered by default.

250 changes: 129 additions & 121 deletions ...ests/recordings/test_azure_mgmt_servicebus_topic_subscription_rule.test_sb_rule_curd.yaml
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions azure-mgmt-servicebus/tests/test_azure_mgmt_servicebus_namespace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ def test_sb_namespace_curd(self, resource_group, location):
# Create a Namespace
namespace_name = "testingpythontestcasenamespace"

namespaceparameter=SBNamespace(location,{'tag1':'value1','tag2':'value2'},SBSku(SkuName.standard))
creatednamespace = self.servicebus_client.namespaces.create_or_update(resource_group_name, namespace_name, namespaceparameter,None,True).output
self.assertEqual(creatednamespace.name,namespace_name)
namespaceparameter=SBNamespace(location=location,tags={'tag1':'value1','tag2':'value2'},sku=SBSku(name=SkuName.standard))
creatednamespace = self.servicebus_client.namespaces.create_or_update(resource_group_name, namespace_name, namespaceparameter).result()
self.assertEqual(creatednamespace.name, namespace_name)
#
# # Get created Namespace
#
Expand All @@ -42,7 +42,7 @@ def test_sb_namespace_curd(self, resource_group, location):

# Get the List of Namespaces under the resourceGroup - list_by_resource_group

listbyresourcegroupresponse = list(self.servicebus_client.namespaces.list_by_resource_group(resource_group_name,False,False))
listbyresourcegroupresponse = list(self.servicebus_client.namespaces.list_by_resource_group(resource_group_name))
self.assertGreater(len(listbyresourcegroupresponse),0,"No Namespace returned, List is empty")
self.assertEqual(listbyresourcegroupresponse[0].name,namespace_name,"Created namespace not found - ListByResourgroup")

Expand Down Expand Up @@ -98,7 +98,7 @@ def test_sb_namespace_curd(self, resource_group, location):
self.assertEqual(createnamespaceauthorule[0].name, defaultauthorule_name)

# Delete the create namespace
deletenamespace = self.servicebus_client.namespaces.delete(resource_group_name, namespace_name,None,True).output
deletenamespace = self.servicebus_client.namespaces.delete(resource_group_name, namespace_name).result()

#------------------------------------------------------------------------------
if __name__ == '__main__':
Expand Down
10 changes: 5 additions & 5 deletions azure-mgmt-servicebus/tests/test_azure_mgmt_servicebus_queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ def test_sb_queue_curd(self, resource_group, location):
# Create a Namespace
namespace_name = "testingpythontestcasequeue"

namespaceparameter = SBNamespace(location, {'tag1': 'value1', 'tag2': 'value2'}, SBSku(SkuName.standard))
creatednamespace = self.servicebus_client.namespaces.create_or_update(resource_group_name, namespace_name, namespaceparameter,None,True).output
namespaceparameter = SBNamespace(location=location, tags={'tag1': 'value1', 'tag2': 'value2'}, sku=SBSku(name=SkuName.standard))
creatednamespace = self.servicebus_client.namespaces.create_or_update(resource_group_name, namespace_name, namespaceparameter).result()
self.assertEqual(creatednamespace.name, namespace_name)

while (self.servicebus_client.namespaces.get(resource_group_name, namespace_name).provisioning_state != 'Succeeded'):
Expand All @@ -56,7 +56,7 @@ def test_sb_queue_curd(self, resource_group, location):
self.assertEqual(listbynamespacequeueresponse[0].name, queue_name)

# update queue
updatequeueresponse = self.servicebus_client.queues.create_or_update(resource_group_name, namespace_name, queue_name, SBQueue( enable_express=True, max_delivery_count=5, max_size_in_megabytes=1024 ))
updatequeueresponse = self.servicebus_client.queues.create_or_update(resource_group_name, namespace_name, queue_name, SBQueue(enable_express=True, max_delivery_count=5, max_size_in_megabytes=1024 ))
self.assertEqual(updatequeueresponse.name, queue_name)
self.assertEqual(updatequeueresponse.max_delivery_count, 5)
self.assertEqual(updatequeueresponse.max_size_in_megabytes, 1024)
Expand Down Expand Up @@ -93,7 +93,7 @@ def test_sb_queue_curd(self, resource_group, location):

# regenerate Keys for authorizationrule - Primary
regenrateSecondarykeyauthorizationrule = self.servicebus_client.queues.regenerate_keys(resource_group_name,namespace_name, queue_name, authoRule_name,'SecondaryKey')
self.assertNotEqual(listkeysauthorizationrule.secondary_key,regenrateSecondarykeyauthorizationrule.secondary_key)
self.assertNotEqual(listkeysauthorizationrule.secondary_key, regenrateSecondarykeyauthorizationrule.secondary_key)

# delete the authorizationrule
self.servicebus_client.queues.delete_authorization_rule(resource_group_name, namespace_name, queue_name, authoRule_name)
Expand All @@ -106,7 +106,7 @@ def test_sb_queue_curd(self, resource_group, location):
self.servicebus_client.queues.delete(resource_group_name, namespace_name, queue_name)

# Delete the create namespace
deletenamespace = self.servicebus_client.namespaces.delete(resource_group_name, namespace_name,None,True).output
deletenamespace = self.servicebus_client.namespaces.delete(resource_group_name, namespace_name).result()

#------------------------------------------------------------------------------
if __name__ == '__main__':
Expand Down
6 changes: 3 additions & 3 deletions azure-mgmt-servicebus/tests/test_azure_mgmt_servicebus_topic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ def test_sb_topic_curd(self, resource_group, location):
# Create a Namespace
namespace_name = "testingpythontestcasetopic"

namespaceparameter = SBNamespace(location, {'tag1': 'value1', 'tag2': 'value2'}, SBSku(SkuName.standard))
creatednamespace = self.servicebus_client.namespaces.create_or_update(resource_group_name, namespace_name, namespaceparameter,None,True).output
namespaceparameter = SBNamespace(location=location, tags={'tag1': 'value1', 'tag2': 'value2'}, sku=SBSku(name=SkuName.standard))
creatednamespace = self.servicebus_client.namespaces.create_or_update(resource_group_name, namespace_name, namespaceparameter).result()
self.assertEqual(creatednamespace.name, namespace_name)

while (self.servicebus_client.namespaces.get(resource_group_name, namespace_name).provisioning_state != 'Succeeded'):
Expand Down Expand Up @@ -106,7 +106,7 @@ def test_sb_topic_curd(self, resource_group, location):
self.servicebus_client.topics.delete(resource_group_name, namespace_name, topic_name)

# Delete the create namespace
deletenamespace = self.servicebus_client.namespaces.delete(resource_group_name, namespace_name,None,True).output
deletenamespace = self.servicebus_client.namespaces.delete(resource_group_name, namespace_name).result()

#------------------------------------------------------------------------------
if __name__ == '__main__':
Expand Down
6 changes: 3 additions & 3 deletions azure-mgmt-servicebus/tests/test_azure_mgmt_servicebus_topic_subscription.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ def test_sb_subscription_curd(self, resource_group, location):
# Create a Namespace
namespace_name = "testingpythontestcasesubscription"

namespaceparameter = SBNamespace(location, {'tag1': 'value1', 'tag2': 'value2'}, SBSku(SkuName.standard))
creatednamespace = self.servicebus_client.namespaces.create_or_update(resource_group_name, namespace_name, namespaceparameter,None,True).output
namespaceparameter = SBNamespace(location=location, tags={'tag1': 'value1', 'tag2': 'value2'}, sku=SBSku(name=SkuName.standard))
creatednamespace = self.servicebus_client.namespaces.create_or_update(resource_group_name, namespace_name, namespaceparameter).result()
self.assertEqual(creatednamespace.name, namespace_name)

while (self.servicebus_client.namespaces.get(resource_group_name, namespace_name).provisioning_state != 'Succeeded'):
Expand Down Expand Up @@ -75,7 +75,7 @@ def test_sb_subscription_curd(self, resource_group, location):
self.servicebus_client.topics.delete(resource_group_name, namespace_name, topic_name)

# Delete the create namespace
deletenamespace = self.servicebus_client.namespaces.delete(resource_group_name, namespace_name,None,True).output
deletenamespace = self.servicebus_client.namespaces.delete(resource_group_name, namespace_name).result()

#------------------------------------------------------------------------------
if __name__ == '__main__':
Expand Down
20 changes: 10 additions & 10 deletions azure-mgmt-servicebus/tests/test_azure_mgmt_servicebus_topic_subscription_rule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ def test_sb_rule_curd(self, resource_group, location):
# Create a Namespace
namespace_name = "testingpythontestcaserule"

namespaceparameter = SBNamespace(location, {'tag1': 'value1', 'tag2': 'value2'}, SBSku(SkuName.standard))
creatednamespace = self.servicebus_client.namespaces.create_or_update(resource_group_name, namespace_name, namespaceparameter,None,True).output
namespaceparameter = SBNamespace(location=location, tags={'tag1': 'value1', 'tag2': 'value2'}, sku=SBSku(name=SkuName.standard))
creatednamespace = self.servicebus_client.namespaces.create_or_update(resource_group_name, namespace_name, namespaceparameter).result()
self.assertEqual(creatednamespace.name, namespace_name)

while (self.servicebus_client.namespaces.get(resource_group_name, namespace_name).provisioning_state != 'Succeeded'):
Expand All @@ -43,25 +43,25 @@ def test_sb_rule_curd(self, resource_group, location):

# Create a Topic
topic_name = "testingpythonsdktopic"
createtopicresponse = self.servicebus_client.topics.create_or_update(resource_group_name, namespace_name,topic_name,SBTopic())
createtopicresponse = self.servicebus_client.topics.create_or_update(resource_group_name, namespace_name, topic_name, SBTopic())
self.assertEqual(createtopicresponse.name, topic_name)

# Get the created Topic
gettopicresponse = self.servicebus_client.topics.get(resource_group_name, namespace_name,topic_name)
gettopicresponse = self.servicebus_client.topics.get(resource_group_name, namespace_name, topic_name)
self.assertEqual(gettopicresponse.name, topic_name)

# Create subscription
subscription_name = "testingpythonsdksubscription"
createsubscriptionresponse =self.servicebus_client.subscriptions.create_or_update(resource_group_name, namespace_name,topic_name,subscription_name,SBSubscription())
createsubscriptionresponse =self.servicebus_client.subscriptions.create_or_update(resource_group_name, namespace_name, topic_name, subscription_name, SBSubscription())
self.assertEqual(createsubscriptionresponse.name, subscription_name)

# Get created subscription
getsubscriptionresponse = self.servicebus_client.subscriptions.get(resource_group_name,namespace_name, topic_name,subscription_name)
getsubscriptionresponse = self.servicebus_client.subscriptions.get(resource_group_name, namespace_name, topic_name,subscription_name)
self.assertEqual(getsubscriptionresponse.name, subscription_name)

# create rule
rule_name = "testingpythonsdkrule"
createruleresponse = self.servicebus_client.rules.create_or_update(resource_group_name,namespace_name, topic_name,subscription_name,rule_name,Rule())
createruleresponse = self.servicebus_client.rules.create_or_update(resource_group_name, namespace_name, topic_name, subscription_name, rule_name, Rule())
self.assertEqual(createruleresponse.name, rule_name)

# get create rule
Expand All @@ -74,8 +74,8 @@ def test_sb_rule_curd(self, resource_group, location):

# update create rule with filter and action
strSqlExp = "myproperty='test'"
ruleparameter = Rule(None,FilterType.sql_filter,SqlFilter(sql_expression=strSqlExp),None)
createruleresponse = self.servicebus_client.rules.create_or_update(resource_group_name, namespace_name,topic_name, subscription_name, rule_name,ruleparameter)
ruleparameter = Rule(action=None, filter_type=FilterType.sql_filter, sql_filter=SqlFilter(sql_expression=strSqlExp), correlation_filter=None)
createruleresponse = self.servicebus_client.rules.create_or_update(resource_group_name, namespace_name, topic_name, subscription_name, rule_name, ruleparameter)
self.assertEqual(createruleresponse.name, rule_name)

# Delete the created subscription
Expand All @@ -85,7 +85,7 @@ def test_sb_rule_curd(self, resource_group, location):
self.servicebus_client.topics.delete(resource_group_name, namespace_name, topic_name)

# Delete the create namespace
deletenamespace = self.servicebus_client.namespaces.delete(resource_group_name, namespace_name,None,True).output
deletenamespace = self.servicebus_client.namespaces.delete(resource_group_name, namespace_name).result()

#------------------------------------------------------------------------------
if __name__ == '__main__':
Expand Down