Commit 31d9a8c9 authored by Nick Craver's avatar Nick Craver

Tests: actual unique key names

parent 0c3f4820
using StackExchange.Redis.Tests.Helpers; using StackExchange.Redis.Tests.Helpers;
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Threading.Tasks; using System.Threading.Tasks;
using Xunit.Abstractions; using Xunit.Abstractions;
...@@ -26,14 +27,7 @@ static BookSleeveTestBase() ...@@ -26,14 +27,7 @@ static BookSleeveTestBase()
}; };
} }
protected static string Me([CallerMemberName] string caller = null) => protected static string Me([CallerFilePath] string filePath = null, [CallerMemberName] string caller = null) => TestBase.Me(filePath, caller);
#if NET462
"net462-" + caller;
#elif NETCOREAPP2_0
"netcoreapp2.0-" + caller;
#else
"unknown-" + caller;
#endif
internal static IServer GetServer(ConnectionMultiplexer conn) => conn.GetServer(conn.GetEndPoints()[0]); internal static IServer GetServer(ConnectionMultiplexer conn) => conn.GetServer(conn.GetEndPoints()[0]);
......
...@@ -258,13 +258,13 @@ protected IServer GetAnyMaster(ConnectionMultiplexer muxer) ...@@ -258,13 +258,13 @@ protected IServer GetAnyMaster(ConnectionMultiplexer muxer)
return muxer; return muxer;
} }
protected static string Me([CallerMemberName] string caller = null) => public static string Me([CallerFilePath] string filePath = null, [CallerMemberName] string caller = null) =>
#if NET462 #if NET462
"net462-" + caller; "net462-" + Path.GetFileNameWithoutExtension(filePath) + "-" + caller;
#elif NETCOREAPP2_0 #elif NETCOREAPP2_0
"netcoreapp2.0-" + caller; "netcoreapp2.0-" + Path.GetFileNameWithoutExtension(filePath) + "-" + caller;
#else #else
"unknown-" + caller; "unknown-" + Path.GetFileNameWithoutExtension(filePath) + "-" + caller;
#endif #endif
protected static TimeSpan RunConcurrent(Action work, int threads, int timeout = 10000, [CallerMemberName] string caller = null) protected static TimeSpan RunConcurrent(Action work, int threads, int timeout = 10000, [CallerMemberName] string caller = null)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment