Skip to content

Commit 601d903

Browse files
authored
[synapse] Correct tests to work on TestResources instances or disable if require uploads (Azure#18833)
1 parent 5d9f181 commit 601d903

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

sdk/synapse/Azure.Analytics.Synapse.AccessControl/tests/AccessControlClientLiveTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ private DisposableClientRole (RoleAssignmentsClient assignmentsClient, RoleDefin
3434
Assignment = assignment;
3535
}
3636

37-
public static async ValueTask<DisposableClientRole> Create (RoleAssignmentsClient assignmentsClient, RoleDefinitionsClient definitionsClient) =>
38-
new DisposableClientRole (assignmentsClient, definitionsClient, await CreateResource (assignmentsClient, definitionsClient));
37+
public static async ValueTask<DisposableClientRole> Create (RoleAssignmentsClient assignmentsClient, RoleDefinitionsClient definitionsClient, SynapseTestEnvironment testEnvironment) =>
38+
new DisposableClientRole (assignmentsClient, definitionsClient, await CreateResource (assignmentsClient, definitionsClient, testEnvironment));
3939

40-
public static async ValueTask<RoleAssignmentDetails> CreateResource (RoleAssignmentsClient assignmentsClient, RoleDefinitionsClient definitionsClient)
40+
public static async ValueTask<RoleAssignmentDetails> CreateResource (RoleAssignmentsClient assignmentsClient, RoleDefinitionsClient definitionsClient, SynapseTestEnvironment testEnvironment)
4141
{
42-
string scope = "workspaces/workspacechhamosynapse";
42+
string scope = "workspaces/" + testEnvironment.WorkspaceName;
4343

4444
Guid? roleID = (await definitionsClient.ListRoleDefinitionsAsync()).Value.First (x => x.Name == "Synapse Administrator").Id;
4545
Guid principalId = Guid.NewGuid();
@@ -81,7 +81,7 @@ public async Task CreateRoleAssignment()
8181
RoleAssignmentsClient assignmentsClient = CreateAssignmentClient();
8282
RoleDefinitionsClient definitionsClient = CreateDefinitionsClient();
8383

84-
await using DisposableClientRole role = await DisposableClientRole.Create (assignmentsClient, definitionsClient);
84+
await using DisposableClientRole role = await DisposableClientRole.Create (assignmentsClient, definitionsClient, TestEnvironment);
8585

8686
Assert.NotNull(role.Assignment.Id);
8787
Assert.NotNull(role.Assignment.RoleDefinitionId);
@@ -94,7 +94,7 @@ public async Task GetRoleAssignment()
9494
RoleAssignmentsClient assignmentsClient = CreateAssignmentClient();
9595
RoleDefinitionsClient definitionsClient = CreateDefinitionsClient();
9696

97-
await using DisposableClientRole role = await DisposableClientRole.Create (assignmentsClient, definitionsClient);
97+
await using DisposableClientRole role = await DisposableClientRole.Create (assignmentsClient, definitionsClient, TestEnvironment);
9898

9999
RoleAssignmentDetails roleAssignment = await assignmentsClient.GetRoleAssignmentByIdAsync(role.Assignment.Id);
100100

@@ -108,7 +108,7 @@ public async Task ListRoleAssignments()
108108
RoleAssignmentsClient assignmentsClient = CreateAssignmentClient();
109109
RoleDefinitionsClient definitionsClient = CreateDefinitionsClient();
110110

111-
await using DisposableClientRole role = await DisposableClientRole.Create (assignmentsClient, definitionsClient);
111+
await using DisposableClientRole role = await DisposableClientRole.Create (assignmentsClient, definitionsClient, TestEnvironment);
112112

113113
Response<IReadOnlyList<SynapseRoleDefinition>> roleAssignments = await definitionsClient.ListRoleDefinitionsAsync();
114114
foreach (SynapseRoleDefinition expected in roleAssignments.Value)
@@ -126,7 +126,7 @@ public async Task DeleteRoleAssignments()
126126
RoleAssignmentsClient assignmentsClient = CreateAssignmentClient();
127127
RoleDefinitionsClient definitionsClient = CreateDefinitionsClient();
128128

129-
RoleAssignmentDetails assignment = await DisposableClientRole.CreateResource (assignmentsClient, definitionsClient);
129+
RoleAssignmentDetails assignment = await DisposableClientRole.CreateResource (assignmentsClient, definitionsClient, TestEnvironment);
130130

131131
Response response = await assignmentsClient.DeleteRoleAssignmentByIdAsync (assignment.Id);
132132
response.AssertSuccess();

sdk/synapse/Azure.Analytics.Synapse.AccessControl/tests/samples/Sample1_HelloWorld.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void AddAndRemoveRoleAssignmentSync()
3737
Guid roleId = role.Id.Value;
3838

3939
string assignedScope = "workspaces/<my-workspace-name>";
40-
/*@@*/assignedScope = "workspaces/workspacechhamosynapse";
40+
/*@@*/assignedScope = "workspaces/" + TestEnvironment.WorkspaceName;
4141

4242
// Replace the string below with the ID you'd like to assign the role.
4343
Guid principalId = /*<my-principal-id>"*/ Guid.NewGuid();

sdk/synapse/Azure.Analytics.Synapse.Artifacts/tests/SparkJobDefinitionClientLiveTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Azure.Analytics.Synapse.Artifacts.Tests
1919
/// These tests have a dependency on live Azure services and may incur costs for the associated
2020
/// Azure subscription.
2121
/// </remarks>
22-
// [Ignore("This test case cannot be automated due to the inability to configure infrastructure to test against.")]
22+
[LiveOnly] // Requires uploaded application on associated storage (wordcount.zip sample)
2323
public class SparkJobDefinitionClientLiveTests : RecordedTestBase<SynapseTestEnvironment>
2424
{
2525
internal class DisposableSparkJobDefinition : IAsyncDisposable

sdk/synapse/Azure.Analytics.Synapse.Monitoring/tests/samples/Sample1_PipelineMonitoring.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ namespace Azure.Analytics.Synapse.Monitoring.Samples
1919
/// </summary>
2020
public partial class Sample1_PipelineMonitoring : SamplesBase<SynapseTestEnvironment>
2121
{
22+
[LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/18832 - Fails on nightly lane due to unreproducable NRE
2223
[Test]
2324
public void MonitorPipelineRuns()
2425
{

0 commit comments

Comments
 (0)