Skip to content

Read env variables and not settings if available #7101

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 13 commits into from
Sep 16, 2019
Merged

Read env variables and not settings if available #7101

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
44ef624
Read env variables and not settings if available
lmazuel Sep 6, 2019
24a9f90
Merge remote-tracking branch 'origin/master' into test_env_update
lmazuel Sep 13, 2019
9938f53
Remove ADLA_JOB_ID from main MgmtTestCase
lmazuel Sep 13, 2019
1dca1b3
Missing self
lmazuel Sep 13, 2019
5c70ab2
Fix incorrect settings usage
lmazuel Sep 13, 2019
6c27ff6
Remove AD_DOMAIN from mgmt testcase
lmazuel Sep 13, 2019
f012b11
Add set_value_to_scrub
lmazuel Sep 13, 2019
41a764b
Fix create_mgmt_client
lmazuel Sep 13, 2019
8d62232
Remove CLIENT_OID from main mgmttestcase
lmazuel Sep 13, 2019
7b51971
No packaging update for KV certificates
lmazuel Sep 13, 2019
c72836e
Packaging update of azure-mgmt-datalake-analytics
AutorestCI Sep 13, 2019
38501d3
Packaging update of azure-graphrbac
AutorestCI Sep 13, 2019
b89bbc3
Fix missing return
lmazuel Sep 16, 2019
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
Prev Previous commit
Next Next commit
Remove AD_DOMAIN from mgmt testcase
  • Loading branch information
@lmazuel
lmazuel committed Sep 13, 2019
commit 6c27ff65077a33295e1d92dbf0408e273f4fe955
16 changes: 13 additions & 3 deletions sdk/graphrbac/azure-graphrbac/tests/test_graphrbac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,28 @@

import pytest

# GraphRBAC tests
AD_DOMAIN = "myaddomain.onmicrosoft.com"

class GraphRbacTest(AzureMgmtTestCase):

def setUp(self):
super(GraphRbacTest, self).setUp()
if self.is_live:
# Set the env variable AZURE_AD_DOMAIN or put AD_DOMAIN in your "mgmt_settings_real" file
self.ad_domain = self.get_settings_value('AD_DOMAIN')
self.scrubber.register_name_pair(self.ad_domain, AD_DOMAIN)
else:
self.ad_domain = AD_DOMAIN

self.graphrbac_client = self.create_basic_client(
azure.graphrbac.GraphRbacManagementClient,
tenant_id=self.settings.AD_DOMAIN
tenant_id=self.ad_domain
)

def _build_object_url(self, object_id):
return "https://graph.windows.net/{}/directoryObjects/{}".format(
self.settings.AD_DOMAIN,
self.ad_domain,
object_id
)

Expand Down Expand Up @@ -105,7 +115,7 @@ def test_graphrbac_users(self):

user = self.graphrbac_client.users.create(
azure.graphrbac.models.UserCreateParameters(
user_principal_name="testbuddy#TEST@{}".format(self.settings.AD_DOMAIN),
user_principal_name="testbuddy#TEST@{}".format(self.ad_domain),
account_enabled=False,
display_name='Test Buddy',
mail_nickname='testbuddy',
Expand Down
2 changes: 0 additions & 2 deletions tools/azure-sdk-tools/devtools_testutils/mgmt_settings_fake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

SUBSCRIPTION_ID = "00000000-0000-0000-0000-000000000000"

# GraphRBAC tests
AD_DOMAIN = "myaddomain.onmicrosoft.com"
# Keyvault tests
TENANT_ID = '00000000-0000-0000-0000-000000000000'
CLIENT_OID = '00000000-0000-0000-0000-000000000000'
Expand Down
2 changes: 1 addition & 1 deletion tools/azure-sdk-tools/devtools_testutils/mgmt_testcase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def __init__(self, method_name, config_file=None,
)

def _setup_scrubber(self):
constants_to_scrub = ['SUBSCRIPTION_ID', 'TENANT_ID']#, 'CLIENT_OID', 'AD_DOMAIN']
constants_to_scrub = ['SUBSCRIPTION_ID', 'TENANT_ID']#, 'CLIENT_OID']
for key in constants_to_scrub:
key_value = self.get_settings_value(key)
if key_value and hasattr(self._fake_settings, key):
Expand Down