Skip to content

Commit 06389a6

Browse files
committed
How many more comments will copilot give me this time?
1 parent 48df8fc commit 06389a6

3 files changed

Lines changed: 2 additions & 4 deletions

File tree

.devcontainer/setup-sqlserver.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CONFIG_DEFAULT_FILE="${CONFIG_DIR}/config.default.jsonc"
3333
CONFIG_FILE="${CONFIG_DIR}/config.jsonc"
3434
echo "Writing test config to ${CONFIG_FILE} (based on ${CONFIG_DEFAULT_FILE})..."
3535
TCP_CONN_STR="Data Source=tcp:${SQL_HOST},${SQL_PORT};Database=Northwind;User Id=sa;Password=${SA_PASSWORD};Encrypt=false;TrustServerCertificate=true"
36-
# config.default.json contains JS-style comments (// ...) which are not valid JSON.
36+
# config.default.jsonc contains JS-style comments (// ...) which are not valid JSON.
3737
# Strip single-line comments before feeding to jq.
3838
sed 's|//.*||' "${CONFIG_DEFAULT_FILE}" \
3939
| jq --arg cs "${TCP_CONN_STR}" \

TESTGUIDE.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,15 +263,13 @@ dotnet build -t:TestSqlClientManual -p:TestSet=2
263263
| `SupportsIntegratedSecurity` | Whether the user running tests has integrated-security access to the target SQL Server. | `true` or `false`. |
264264
| `LocalDbAppName` | Optional LocalDB instance name. Empty disables LocalDB testing. | `MSSQLLocalDB` or another local instance. |
265265
| `LocalDbSharedInstanceName` | Optional shared LocalDB instance name. | Used only when testing shared LocalDB. |
266-
| `SupportsFileStream` | Whether FileStream tests are supported by the target. | `true` or `false`. |
267266
| `FileStreamDirectory` | Directory used for FileStream database setup. | Use an escaped absolute path in JSON. |
268267
| `UseManagedSNIOnWindows` | Enables Managed SNI on Windows test coverage. | `true` or `false`. |
269268
| `DNSCachingConnString` | Optional connection string for DNS caching tests. | Used with DNS caching server settings. |
270269
| `DNSCachingServerCR` | Optional DNS caching control-ring server. | Feature-specific tests only. |
271270
| `DNSCachingServerTR` | Optional DNS caching tenant-ring server. | Feature-specific tests only. |
272271
| `IsDNSCachingSupportedCR` | Enables DNS caching control-ring tests. | `true` or `false`. |
273272
| `IsDNSCachingSupportedTR` | Enables DNS caching tenant-ring tests. | `true` or `false`. |
274-
| `IsAzureSynapse` | Marks the target as Azure Synapse. | Some SQL Server-specific tests are skipped when `true`. |
275273
| `EnclaveAzureDatabaseConnString` | Optional Azure SQL database connection string for enclave tests. | Feature-specific tests only. |
276274
| `ManagedIdentitySupported` | Whether managed identity tests should run. | Defaults to `true`. Set `false` if unavailable. |
277275
| `UserManagedIdentityClientId` | Optional client ID for user-assigned managed identity tests. | Feature-specific tests only. |

src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public static void UpdateConfig(Config updatedConfig, string configPath = @"conf
9797
return JsonSerializer.Deserialize<Config>(sr.ReadToEnd(), JsonSerializerOptions) ??
9898
throw new InvalidOperationException($"Failed to deserialize config from '{configPath}'");
9999
}
100-
catch (FileNotFoundException)
100+
catch (Exception e) when (e is FileNotFoundException or DirectoryNotFoundException)
101101
{
102102
// File did not exist at the path given. We will try a different location.
103103
return null;

0 commit comments

Comments
 (0)