Skip to content

Port storage and media tests to use devtools #1226

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
merged 1 commit into from
Jun 27, 2017
Merged

Port storage and media tests to use devtools #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ install:
- pip install nose
- pip uninstall -y azure-common # Use azure-common from this repo, not the PyPI version azure-storage pulls in.
script:
- python ./azure_nosetests.py
- python ./azure_nosetests.py */tests
# If you get "argument list too long" you have to switch to this:
# find azure-* -name tests | xargs python ./azure_nosetests.py
# coverage combine
after_success:
- bash <(curl -s https://codecov.io/bash)
before_deploy:
Expand Down
3 changes: 2 additions & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ install:

build: off

test_script: "%PYTHON%\\python.exe ./azure_nosetests.py"
test_script:
- ps: & ${env:PYTHON}/python.exe ./azure_nosetests.py azure-mgmt/tests azure-mgmt-media/tests
0 ...mgmt_containerregistry.test_registry.yaml → ...mgmt_containerregistry.test_registry.yaml
View file
Open in desktop
File renamed without changes.
0 ...try_2017_06_01_preview.test_registry.yaml → ...try_2017_06_01_preview.test_registry.yaml
View file
Open in desktop
File renamed without changes.
0 ...stry_2017_06_01_preview.test_webhook.yaml → ...stry_2017_06_01_preview.test_webhook.yaml
View file
Open in desktop
File renamed without changes.
68 changes: 26 additions & 42 deletions ...mgmt/tests/test_mgmt_containerregistry.py → ...stry/tests/test_mgmt_containerregistry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,74 +9,58 @@

import azure.mgmt.containerregistry
import azure.mgmt.storage
from testutils.common_recordingtestcase import record
from tests.mgmt_testcase import HttpStatusCode, AzureMgmtTestCase

from devtools_testutils import (
AzureMgmtTestCase, FakeStorageAccount,
ResourceGroupPreparer, StorageAccountPreparer
)


FAKE_STORAGE = FakeStorageAccount(
name='pyacrstorage',
id=''
)


class MgmtACRTest(AzureMgmtTestCase):

def setUp(self):
super(MgmtACRTest, self).setUp()
self.region = 'westus'
self.client = self.create_mgmt_client(
azure.mgmt.containerregistry.ContainerRegistryManagementClient
)
self.storage_name = self.get_resource_name('pyacrstorage')
self.storage_key = ''
if not self.is_playback():
self.create_resource_group()

self.storage_client = self.create_mgmt_client(
azure.mgmt.storage.StorageManagementClient
)

async_storage_creation = self.storage_client.storage_accounts.create(
self.group_name,
self.storage_name,
{
'location': self.region,
'sku': {
'name': 'Standard_LRS'
},
'kind': 'Storage'
}
)
self.storage_account = async_storage_creation.result()
storage_keys = self.storage_client.storage_accounts.list_keys(
self.group_name, self.storage_name)
storage_keys = {v.key_name: v.value for v in storage_keys.keys}
self.storage_key = storage_keys['key1']

@record
def test_registry(self):

@ResourceGroupPreparer()
@StorageAccountPreparer(name_prefix='pyacrstorage', playback_fake_resource=FAKE_STORAGE)
def test_registry(self, resource_group, location, storage_account, storage_account_key):
registry_name = self.get_resource_name('pyacr')

name_status = self.client.registries.check_name_availability(registry_name)
self.assertTrue(name_status.name_available)

async_registry_creation = self.client.registries.create(
self.group_name,
resource_group.name,
registry_name,
{
'location': self.region,
'location': location,
'sku': {
'name': 'Basic'
},
'storage_account': {
'name': self.storage_name,
'access_key': self.storage_key
'name': storage_account.name,
'access_key': storage_account_key,
}
}
)
registry = async_registry_creation.result()
self.assertEqual(registry.name, registry_name)
self.assertEqual(registry.location, self.region)
self.assertEqual(registry.location, location)
self.assertEqual(registry.sku.name, 'Basic')
self.assertEqual(registry.sku.tier, 'Basic')
self.assertEqual(registry.admin_user_enabled, False)

registry = self.client.registries.update(
self.group_name,
resource_group.name,
registry_name,
{
'admin_user_enabled': True
Expand All @@ -85,21 +69,21 @@ def test_registry(self):
self.assertEqual(registry.name, registry_name)
self.assertEqual(registry.admin_user_enabled, True)

registry = self.client.registries.get(self.group_name, registry_name)
registry = self.client.registries.get(resource_group.name, registry_name)
self.assertEqual(registry.name, registry_name)
self.assertEqual(registry.admin_user_enabled, True)

registries = list(self.client.registries.list_by_resource_group(self.group_name))
registries = list(self.client.registries.list_by_resource_group(resource_group.name))
self.assertEqual(len(registries), 1)

credentials = self.client.registries.list_credentials(self.group_name, registry_name)
credentials = self.client.registries.list_credentials(resource_group.name, registry_name)
self.assertEqual(len(credentials.passwords), 2)

credentials = self.client.registries.regenerate_credential(
self.group_name, registry_name, 'password')
resource_group.name, registry_name, 'password')
self.assertEqual(len(credentials.passwords), 2)

self.client.registries.delete(self.group_name, registry_name)
self.client.registries.delete(resource_group.name, registry_name)


#------------------------------------------------------------------------------
Expand Down
62 changes: 29 additions & 33 deletions ...t_containerregistry_2017_06_01_preview.py → ...t_containerregistry_2017_06_01_preview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,50 +8,46 @@
import unittest

import azure.mgmt.containerregistry
import azure.mgmt.storage
from testutils.common_recordingtestcase import record
from tests.mgmt_testcase import HttpStatusCode, AzureMgmtTestCase

from devtools_testutils import AzureMgmtTestCase, ResourceGroupPreparer


class MgmtACRTest20170601Preview(AzureMgmtTestCase):

def setUp(self):
super(MgmtACRTest20170601Preview, self).setUp()
self.region = 'westcentralus'
self.client = self.create_mgmt_client(
azure.mgmt.containerregistry.ContainerRegistryManagementClient,
api_version='2017-06-01-preview'
)
if not self.is_playback():
self.create_resource_group()

@record
def test_registry(self):
@ResourceGroupPreparer(location='westcentralus')
def test_registry(self, resource_group, location):
registry_name = self.get_resource_name('pyacr')

name_status = self.client.registries.check_name_availability(registry_name)
self.assertTrue(name_status.name_available)

async_registry_creation = self.client.registries.create(
self.group_name,
resource_group.name,
registry_name,
{
'location': self.region,
'location': location,
'sku': {
'name': 'Managed_Standard'
}
}
)
registry = async_registry_creation.result()
self.assertEqual(registry.name, registry_name)
self.assertEqual(registry.location, self.region)
self.assertEqual(registry.location, location)
self.assertEqual(registry.sku.name, 'Managed_Standard')
self.assertEqual(registry.sku.tier, 'Managed')
self.assertEqual(registry.provisioning_state, 'Succeeded')
self.assertEqual(registry.admin_user_enabled, False)

registry = self.client.registries.update(
self.group_name,
resource_group.name,
registry_name,
{
'admin_user_enabled': True
Expand All @@ -60,63 +56,63 @@ def test_registry(self):
self.assertEqual(registry.name, registry_name)
self.assertEqual(registry.admin_user_enabled, True)

registry = self.client.registries.get(self.group_name, registry_name)
registry = self.client.registries.get(resource_group.name, registry_name)
self.assertEqual(registry.name, registry_name)
self.assertEqual(registry.admin_user_enabled, True)

registries = list(self.client.registries.list_by_resource_group(self.group_name))
registries = list(self.client.registries.list_by_resource_group(resource_group.name))
self.assertEqual(len(registries), 1)

credentials = self.client.registries.list_credentials(self.group_name, registry_name)
credentials = self.client.registries.list_credentials(resource_group.name, registry_name)
self.assertEqual(len(credentials.passwords), 2)

credentials = self.client.registries.regenerate_credential(
self.group_name, registry_name, 'password')
resource_group.name, registry_name, 'password')
self.assertEqual(len(credentials.passwords), 2)

self.client.registries.delete(self.group_name, registry_name)
self.client.registries.delete(resource_group.name, registry_name)

@record
def test_webhook(self):
@ResourceGroupPreparer(location='westcentralus')
def test_webhook(self, resource_group, location):
registry_name = self.get_resource_name('pyacr')
webhook_name = self.get_resource_name('pyacrwebhook')

async_registry_creation = self.client.registries.create(
self.group_name,
resource_group.name,
registry_name,
{
'location': self.region,
'location': location,
'sku': {
'name': 'Managed_Standard'
}
}
)
registry = async_registry_creation.result()
self.assertEqual(registry.name, registry_name)
self.assertEqual(registry.location, self.region)
self.assertEqual(registry.location, location)
self.assertEqual(registry.sku.name, 'Managed_Standard')
self.assertEqual(registry.sku.tier, 'Managed')
self.assertEqual(registry.provisioning_state, 'Succeeded')
self.assertEqual(registry.admin_user_enabled, False)

async_webhook_creation = self.client.webhooks.create(
self.group_name,
resource_group.name,
registry_name,
webhook_name,
{
'location': self.region,
'location': location,
'service_uri': 'http://www.microsoft.com',
'actions': ['push']
}
)
webhook = async_webhook_creation.result()
self.assertEqual(webhook.name, webhook_name)
self.assertEqual(webhook.location, self.region)
self.assertEqual(webhook.location, location)
self.assertEqual(webhook.actions, ['push'])
self.assertEqual(webhook.status, 'enabled')

async_webhook_update = self.client.webhooks.update(
self.group_name,
resource_group.name,
registry_name,
webhook_name,
{
Expand All @@ -130,12 +126,12 @@ def test_webhook(self):
self.assertEqual(webhook.name, webhook_name)
self.assertEqual(webhook.scope, 'hello-world')

webhook = self.client.webhooks.get(self.group_name, registry_name, webhook_name)
webhook = self.client.webhooks.get(resource_group.name, registry_name, webhook_name)
self.assertEqual(webhook.name, webhook_name)
self.assertEqual(webhook.scope, 'hello-world')

webhook_config = self.client.webhooks.get_callback_config(
self.group_name,
resource_group.name,
registry_name,
webhook_name
)
Expand All @@ -145,14 +141,14 @@ def test_webhook(self):
'key': 'value'
})

webhooks = list(self.client.webhooks.list(self.group_name, registry_name))
webhooks = list(self.client.webhooks.list(resource_group.name, registry_name))
self.assertEqual(len(webhooks), 1)

self.client.webhooks.ping(self.group_name, registry_name, webhook_name)
self.client.webhooks.list_events(self.group_name, registry_name, webhook_name)
self.client.webhooks.ping(resource_group.name, registry_name, webhook_name)
self.client.webhooks.list_events(resource_group.name, registry_name, webhook_name)

self.client.webhooks.delete(self.group_name, registry_name, webhook_name)
self.client.registries.delete(self.group_name, registry_name)
self.client.webhooks.delete(resource_group.name, registry_name, webhook_name)
self.client.registries.delete(resource_group.name, registry_name)


#------------------------------------------------------------------------------
Expand Down
Empty file added azure-mgmt-media/tests/__init__.py
View file
Open in desktop
Empty file.
0 ...ecordings/test_mgmt_media.test_media.yaml → ...ecordings/test_mgmt_media.test_media.yaml
View file
Open in desktop
File renamed without changes.
Loading