Skip to content

Fix Storage File Share race condition when running tests in parallel #47725

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
alzimmermsft merged 1 commit into from
Jan 15, 2026
+9 −15
Merged

Fix Storage File Share race condition when running tests in parallel #47725

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
16 changes: 5 additions & 11 deletions ...re-storage-file-share/src/test/java/com/azure/storage/file/share/FileServiceApiTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import com.azure.storage.file.share.models.UserDelegationKey;
import com.azure.storage.file.share.options.ShareCreateOptions;
import com.azure.storage.file.share.options.ShareSetPropertiesOptions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIf;
Expand All @@ -44,6 +43,7 @@
import java.time.OffsetDateTime;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
Expand All @@ -66,7 +66,9 @@ public class FileServiceApiTests extends FileShareTestBase {
private static final Map<String, String> TEST_METADATA = Collections.singletonMap("testmetadata", "value");
private static final String REALLY_LONG_STRING
= "thisisareallylongstringthatexceedsthe64characterlimitallowedoncertainproperties";
private static List<ShareCorsRule> tooManyRules = new ArrayList<>();
private static final List<ShareCorsRule> TOO_MANY_RULES
= Collections.unmodifiableList(Arrays.asList(new ShareCorsRule(), new ShareCorsRule(), new ShareCorsRule(),
new ShareCorsRule(), new ShareCorsRule(), new ShareCorsRule()));
private static final List<ShareCorsRule> INVALID_ALLOWED_HEADER
= Collections.singletonList(new ShareCorsRule().setAllowedHeaders(REALLY_LONG_STRING));
private static final List<ShareCorsRule> INVALID_EXPOSED_HEADER
Expand All @@ -76,14 +78,6 @@ public class FileServiceApiTests extends FileShareTestBase {
private static final List<ShareCorsRule> INVALID_ALLOWED_METHOD
= Collections.singletonList(new ShareCorsRule().setAllowedMethods("NOTAREALHTTPMETHOD"));

@BeforeAll
public static void setupSpec() {
for (int i = 0; i < 6; i++) {
tooManyRules.add(new ShareCorsRule());
}
tooManyRules = Collections.unmodifiableList(tooManyRules);
}

@BeforeEach
public void setup() {
shareName = generateShareName();
Expand Down Expand Up @@ -400,7 +394,7 @@ public void setAndGetPropertiesWithInvalidArgs(List<ShareCorsRule> coreList, int
}

private static Stream<Arguments> setAndGetPropertiesWithInvalidArgsSupplier() {
return Stream.of(Arguments.of(tooManyRules, 400, ShareErrorCode.INVALID_XML_DOCUMENT),
return Stream.of(Arguments.of(TOO_MANY_RULES, 400, ShareErrorCode.INVALID_XML_DOCUMENT),
Arguments.of(INVALID_ALLOWED_HEADER, 400, ShareErrorCode.INVALID_XML_DOCUMENT),
Arguments.of(INVALID_EXPOSED_HEADER, 400, ShareErrorCode.INVALID_XML_DOCUMENT),
Arguments.of(INVALID_ALLOWED_ORIGIN, 400, ShareErrorCode.INVALID_XML_DOCUMENT),
Expand Down
8 changes: 4 additions & 4 deletions ...orage-file-share/src/test/java/com/azure/storage/file/share/FileServiceAsyncApiTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import java.time.OffsetDateTime;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
Expand All @@ -63,7 +64,9 @@ public class FileServiceAsyncApiTests extends FileShareTestBase {
private static final Map<String, String> TEST_METADATA = Collections.singletonMap("testmetadata", "value");
private static final String REALLY_LONG_STRING
= "thisisareallylongstringthatexceedsthe64characterlimitallowedoncertainproperties";
private static final List<ShareCorsRule> TOO_MANY_RULES = new ArrayList<>();
private static final List<ShareCorsRule> TOO_MANY_RULES
= Collections.unmodifiableList(Arrays.asList(new ShareCorsRule(), new ShareCorsRule(), new ShareCorsRule(),
new ShareCorsRule(), new ShareCorsRule(), new ShareCorsRule()));
private static final List<ShareCorsRule> INVALID_ALLOWED_HEADER
= Collections.singletonList(new ShareCorsRule().setAllowedHeaders(REALLY_LONG_STRING));
private static final List<ShareCorsRule> INVALID_EXPOSED_HEADER
Expand All @@ -77,9 +80,6 @@ public class FileServiceAsyncApiTests extends FileShareTestBase {
public void setup() {
shareName = generateShareName();
primaryFileServiceAsyncClient = fileServiceBuilderHelper().buildAsyncClient();
for (int i = 0; i < 6; i++) {
TOO_MANY_RULES.add(new ShareCorsRule());
}
}

@Test
Expand Down
Loading