Skip to content

Commit 941c69c

Browse files
author
Zubair Abid
committed
Most SQL tests pass now
1 parent 8bb6d1d commit 941c69c

10 files changed

Lines changed: 9188 additions & 25596 deletions

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_wl_sql_container.yaml

Lines changed: 2948 additions & 1318 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_wl_sql_item.yaml

Lines changed: 1149 additions & 3252 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_wl_sql_policy.yaml

Lines changed: 109 additions & 75 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_wl_sql_protectable_item.yaml

Lines changed: 647 additions & 2241 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_wl_sql_protection.yaml

Lines changed: 1036 additions & 4338 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_wl_sql_restore.yaml

Lines changed: 1623 additions & 4699 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_wl_sql_restore_as_files.yaml

Lines changed: 1202 additions & 4590 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_wl_sql_rp.yaml

Lines changed: 336 additions & 4998 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/test_backup_commands.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,7 +1339,7 @@ def test_backup_encryption(self, resource_group, resource_group_location, vault1
13391339
self.kwargs['key_vault_id'] = "subscriptions/{}/resourceGroups/{}/providers/Microsoft.KeyVault/vaults/{}".format(
13401340
subscription, resource_group, key_vault)
13411341
# Uncomment during live runs
1342-
self.cmd('role assignment create --role "{user_rbac_permissions}" --scope "{key_vault_id}" --assignee "{user_principal_id}"')
1342+
# self.cmd('role assignment create --role "{user_rbac_permissions}" --scope "{key_vault_id}" --assignee "{user_principal_id}"')
13431343

13441344
self.kwargs['identity1_id'] = self.cmd('identity create -n "{identity1}" -g "{rg}" --query id').get_output_in_json()
13451345
self.kwargs['identity1_principalid'] = self.cmd('identity show -n "{identity1}" -g "{rg}" --query principalId').get_output_in_json()
@@ -1394,17 +1394,17 @@ def test_backup_encryption(self, resource_group, resource_group_location, vault1
13941394

13951395
# Uncomment during live runs
13961396
role_id = '/subscriptions/{}/providers/Microsoft.Authorization/roleDefinitions/e147488a-f6f5-4113-8e2d-b22465e65bf6'.format(subscription)
1397-
rbac1_json = self.cmd('role assignment create --scope "{key_vault_id}" --assignee "{identity1_principalid}" --role "{identity_rbac_permissions}"').get_output_in_json()
1398-
self.assertEqual(rbac1_json['roleDefinitionId'], role_id)
1397+
# rbac1_json = self.cmd('role assignment create --scope "{key_vault_id}" --assignee "{identity1_principalid}" --role "{identity_rbac_permissions}"').get_output_in_json()
1398+
# self.assertEqual(rbac1_json['roleDefinitionId'], role_id)
13991399

1400-
rbac2_json = self.cmd('role assignment create --scope "{key_vault_id}" --assignee "{identity2_principalid}" --role "{identity_rbac_permissions}"').get_output_in_json()
1401-
self.assertEqual(rbac2_json['roleDefinitionId'], role_id)
1400+
# rbac2_json = self.cmd('role assignment create --scope "{key_vault_id}" --assignee "{identity2_principalid}" --role "{identity_rbac_permissions}"').get_output_in_json()
1401+
# self.assertEqual(rbac2_json['roleDefinitionId'], role_id)
14021402

1403-
rbac3_json = self.cmd('role assignment create --scope "{key_vault_id}" --assignee "{system1_principalid}" --role "{identity_rbac_permissions}"').get_output_in_json()
1404-
self.assertEqual(rbac3_json['roleDefinitionId'], role_id)
1403+
# rbac3_json = self.cmd('role assignment create --scope "{key_vault_id}" --assignee "{system1_principalid}" --role "{identity_rbac_permissions}"').get_output_in_json()
1404+
# self.assertEqual(rbac3_json['roleDefinitionId'], role_id)
14051405

1406-
rbac4_json = self.cmd('role assignment create --scope "{key_vault_id}" --assignee "{system2_principalid}" --role "{identity_rbac_permissions}"').get_output_in_json()
1407-
self.assertEqual(rbac4_json['roleDefinitionId'], role_id)
1406+
# rbac4_json = self.cmd('role assignment create --scope "{key_vault_id}" --assignee "{system2_principalid}" --role "{identity_rbac_permissions}"').get_output_in_json()
1407+
# self.assertEqual(rbac4_json['roleDefinitionId'], role_id)
14081408

14091409
self.cmd('backup vault encryption update --encryption-key-id "{key1_id}" --mi-user-assigned "{identity1_id}" -g "{rg}" -n "{vault1}"')
14101410

src/azure-cli/azure/cli/command_modules/backup/tests/latest/test_sql_commands.py

Lines changed: 129 additions & 76 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)