From 42f6ec7849a6c58341e70ebbc67bcb54340f2ad3 Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Wed, 4 Aug 2021 15:30:41 +0200 Subject: [PATCH] Some minor test baseline fixes --- .../TestUtilities/TestSqlLoggerFactory.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/test/EFCore.Relational.Specification.Tests/TestUtilities/TestSqlLoggerFactory.cs b/test/EFCore.Relational.Specification.Tests/TestUtilities/TestSqlLoggerFactory.cs index d2a3a3a8761..aa37b8cc649 100644 --- a/test/EFCore.Relational.Specification.Tests/TestUtilities/TestSqlLoggerFactory.cs +++ b/test/EFCore.Relational.Specification.Tests/TestUtilities/TestSqlLoggerFactory.cs @@ -21,6 +21,8 @@ public class TestSqlLoggerFactory : ListLoggerFactory private static readonly string _eol = Environment.NewLine; + private static object _queryBaselineFileLock = new(); + public TestSqlLoggerFactory() : this(_ => true) { @@ -85,7 +87,9 @@ public void AssertBaseline(string[] expected, bool assertOrder = true) var currentDirectory = Directory.GetCurrentDirectory(); var logFile = currentDirectory.Substring( 0, - currentDirectory.LastIndexOf("\\artifacts\\", StringComparison.Ordinal) + 1) + currentDirectory.LastIndexOf( + $"{Path.DirectorySeparatorChar}artifacts{Path.DirectorySeparatorChar}", + StringComparison.Ordinal) + 1) + "QueryBaseline.txt"; var testInfo = testName + " : " + lineNumber + FileNewLine; @@ -106,7 +110,10 @@ public void AssertBaseline(string[] expected, bool assertOrder = true) var contents = testInfo + newBaseLine + FileNewLine + "--------------------" + FileNewLine; - File.AppendAllText(logFile, contents); + lock (_queryBaselineFileLock) + { + File.AppendAllText(logFile, contents); + } throw; }