Skip to content

For tests, get CLI from edge #129

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
derekbekoe merged 6 commits into from
Apr 5, 2018
Merged

For tests, get CLI from edge #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5ba64a
Get CLI from edge
derekbekoe Apr 5, 2018
ff12afa
Fix recordings
derekbekoe Apr 5, 2018
a04c7c6
Fix others
derekbekoe Apr 5, 2018
a542c4c
Test fix
derekbekoe Apr 5, 2018
aaf9aa2
fix again
derekbekoe Apr 5, 2018
1206d3f
try this
derekbekoe Apr 5, 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
4 changes: 1 addition & 3 deletions scripts/ci/test_source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ set -ex

# Install CLI & CLI testsdk
echo "Installing azure-cli-testsdk and azure-cli..."

# Update the git commit or branch when we need a new version of azure-cli-testsdk
pip install --pre azure-cli --extra-index-url https://azurecliprod.blob.core.windows.net/edge
pip install "git+https://github.com/Azure/azure-cli@dev#egg=azure-cli-testsdk&subdirectory=src/azure-cli-testsdk" -q
pip install knack==0.3.2 -q
echo "Installed."

python ./scripts/ci/test_source.py -v
Expand Down
20 changes: 10 additions & 10 deletions src/dns/azext_dns/tests/latest/recordings/test_private_dns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ interactions:
AZURECLI/2.0.29]
accept-language: [en-US]
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_dns000001/providers/Microsoft.Network/virtualNetworks/regvnet?api-version=2018-01-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_dns000001/providers/Microsoft.Network/virtualNetworks/regvnet?api-version=2018-02-01
response:
body: {string: "{\r\n \"name\": \"regvnet\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_dns000001/providers/Microsoft.Network/virtualNetworks/regvnet\"\
,\r\n \"etag\": \"W/\\\"765f5089-5dcd-4b01-ad45-ea13e050a6d6\\\"\",\r\n \
Expand All @@ -82,7 +82,7 @@ interactions:
\ [],\r\n \"enableDdosProtection\": false,\r\n \"enableVmProtection\"\
: false\r\n }\r\n}"}
headers:
azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/03c50379-a01f-4e89-b8d2-9891d46d9ca9?api-version=2018-01-01']
azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/03c50379-a01f-4e89-b8d2-9891d46d9ca9?api-version=2018-02-01']
cache-control: [no-cache]
content-length: ['770']
content-type: [application/json; charset=utf-8]
Expand All @@ -105,7 +105,7 @@ interactions:
msrest_azure/0.4.22 networkmanagementclient/2.0.0rc1 Azure-SDK-For-Python
AZURECLI/2.0.29]
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/03c50379-a01f-4e89-b8d2-9891d46d9ca9?api-version=2018-01-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/03c50379-a01f-4e89-b8d2-9891d46d9ca9?api-version=2018-02-01
response:
body: {string: "{\r\n \"status\": \"InProgress\"\r\n}"}
headers:
Expand All @@ -132,7 +132,7 @@ interactions:
msrest_azure/0.4.22 networkmanagementclient/2.0.0rc1 Azure-SDK-For-Python
AZURECLI/2.0.29]
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/03c50379-a01f-4e89-b8d2-9891d46d9ca9?api-version=2018-01-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/03c50379-a01f-4e89-b8d2-9891d46d9ca9?api-version=2018-02-01
response:
body: {string: "{\r\n \"status\": \"Succeeded\"\r\n}"}
headers:
Expand All @@ -159,7 +159,7 @@ interactions:
msrest_azure/0.4.22 networkmanagementclient/2.0.0rc1 Azure-SDK-For-Python
AZURECLI/2.0.29]
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_dns000001/providers/Microsoft.Network/virtualNetworks/regvnet?api-version=2018-01-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_dns000001/providers/Microsoft.Network/virtualNetworks/regvnet?api-version=2018-02-01
response:
body: {string: "{\r\n \"name\": \"regvnet\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_dns000001/providers/Microsoft.Network/virtualNetworks/regvnet\"\
,\r\n \"etag\": \"W/\\\"fb887bd7-0b60-4bae-a17b-a1975c3c9a7a\\\"\",\r\n \
Expand Down Expand Up @@ -227,7 +227,7 @@ interactions:
AZURECLI/2.0.29]
accept-language: [en-US]
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_dns000001/providers/Microsoft.Network/virtualNetworks/resvnet?api-version=2018-01-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_dns000001/providers/Microsoft.Network/virtualNetworks/resvnet?api-version=2018-02-01
response:
body: {string: "{\r\n \"name\": \"resvnet\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_dns000001/providers/Microsoft.Network/virtualNetworks/resvnet\"\
,\r\n \"etag\": \"W/\\\"7e4ce79b-9854-43dd-a927-ae13b44f87c5\\\"\",\r\n \
Expand All @@ -240,7 +240,7 @@ interactions:
\ [],\r\n \"enableDdosProtection\": false,\r\n \"enableVmProtection\"\
: false\r\n }\r\n}"}
headers:
azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/2aed309b-1a46-4557-8866-9ba05dee64e5?api-version=2018-01-01']
azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/2aed309b-1a46-4557-8866-9ba05dee64e5?api-version=2018-02-01']
cache-control: [no-cache]
content-length: ['770']
content-type: [application/json; charset=utf-8]
Expand All @@ -263,7 +263,7 @@ interactions:
msrest_azure/0.4.22 networkmanagementclient/2.0.0rc1 Azure-SDK-For-Python
AZURECLI/2.0.29]
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/2aed309b-1a46-4557-8866-9ba05dee64e5?api-version=2018-01-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/2aed309b-1a46-4557-8866-9ba05dee64e5?api-version=2018-02-01
response:
body: {string: "{\r\n \"status\": \"InProgress\"\r\n}"}
headers:
Expand All @@ -290,7 +290,7 @@ interactions:
msrest_azure/0.4.22 networkmanagementclient/2.0.0rc1 Azure-SDK-For-Python
AZURECLI/2.0.29]
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/2aed309b-1a46-4557-8866-9ba05dee64e5?api-version=2018-01-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/2aed309b-1a46-4557-8866-9ba05dee64e5?api-version=2018-02-01
response:
body: {string: "{\r\n \"status\": \"Succeeded\"\r\n}"}
headers:
Expand All @@ -317,7 +317,7 @@ interactions:
msrest_azure/0.4.22 networkmanagementclient/2.0.0rc1 Azure-SDK-For-Python
AZURECLI/2.0.29]
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_dns000001/providers/Microsoft.Network/virtualNetworks/resvnet?api-version=2018-01-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_dns000001/providers/Microsoft.Network/virtualNetworks/resvnet?api-version=2018-02-01
response:
body: {string: "{\r\n \"name\": \"resvnet\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_dns000001/providers/Microsoft.Network/virtualNetworks/resvnet\"\
,\r\n \"etag\": \"W/\\\"dce2c474-cf6b-4364-915f-5979ff06e585\\\"\",\r\n \
Expand Down
4 changes: 2 additions & 2 deletions src/subscription/azext_subscription/tests/latest/test_subscription_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
class AzureSubscriptionScenarioTest(ScenarioTest):
def test_create_subscription(self):
enrollment_accounts = self.cmd('billing enrollment-account list').get_output_in_json()
result = self.cmd('account create --enrollment-account-name {} --offer-type MS-AZR-0148P'.format(enrollment_accounts[0].name)).get_output_in_json()
result = self.cmd('account create --enrollment-account-name {} --offer-type MS-AZR-0148P'.format(enrollment_accounts[0]['name'])).get_output_in_json()
self.assertIsNotNone(result)
self.assertIsNotNone(result.subscription_link)
self.assertIsNotNone(result['subscriptionLink'])