From ba9b9fbf529d46b961ead4a653adcbf2f2f3c92c Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 19 Dec 2024 14:04:38 -0800 Subject: [PATCH 1/2] Skip tests on internal too --- src/Testing/src/xunit/SkipOnHelixAttribute.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Testing/src/xunit/SkipOnHelixAttribute.cs b/src/Testing/src/xunit/SkipOnHelixAttribute.cs index 2f8162de0271..a93c425c2f3e 100644 --- a/src/Testing/src/xunit/SkipOnHelixAttribute.cs +++ b/src/Testing/src/xunit/SkipOnHelixAttribute.cs @@ -66,7 +66,9 @@ private bool ShouldSkip() return true; } - return Queues.ToLowerInvariant().Split(';').Contains(targetQueue); + // We have "QueueName" and "QueueName.Open" queues for internal and public builds + // If we want to skip the test in the public queue, we want to skip it in the internal queue, and vice versa + return Queues.ToLowerInvariant().Split(';').Any(q => q.Equals(targetQueue) || q.StartsWith(targetQueue) || targetQueue.StartsWith(q)); } public static bool OnHelix() => HelixHelper.OnHelix(); From 05e89fcf6375e2f5513b469da11d8f78c9b664b7 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 19 Dec 2024 14:27:52 -0800 Subject: [PATCH 2/2] StringComparison --- src/Testing/src/xunit/SkipOnHelixAttribute.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Testing/src/xunit/SkipOnHelixAttribute.cs b/src/Testing/src/xunit/SkipOnHelixAttribute.cs index a93c425c2f3e..d143e2298d23 100644 --- a/src/Testing/src/xunit/SkipOnHelixAttribute.cs +++ b/src/Testing/src/xunit/SkipOnHelixAttribute.cs @@ -68,7 +68,8 @@ private bool ShouldSkip() // We have "QueueName" and "QueueName.Open" queues for internal and public builds // If we want to skip the test in the public queue, we want to skip it in the internal queue, and vice versa - return Queues.ToLowerInvariant().Split(';').Any(q => q.Equals(targetQueue) || q.StartsWith(targetQueue) || targetQueue.StartsWith(q)); + return Queues.ToLowerInvariant().Split(';').Any(q => q.Equals(targetQueue, StringComparison.Ordinal) || q.StartsWith(targetQueue, StringComparison.Ordinal) || + targetQueue.StartsWith(q, StringComparison.Ordinal)); } public static bool OnHelix() => HelixHelper.OnHelix();