Skip to content

Commit

Permalink
RavenDB-12279 need to skip tests because they are causing random sock…
Browse files Browse the repository at this point in the history
…et failures in subsequent tests around 30 seconds after they are executed (https://github.com/dotnet/corefx/issues/30691)
  • Loading branch information
ppekrol committed Nov 14, 2018
1 parent 8970bb5 commit 830d346
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
3 changes: 1 addition & 2 deletions src/Raven.Server/Documents/Indexes/Index.cs
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ public abstract class Index : ITombstoneAware, IDisposable, ILowMemoryHandler

protected UnmanagedBuffersPoolWithLowMemoryHandling _unmanagedBuffersPool;

internal StorageEnvironment Env => _environment;
private StorageEnvironment _environment;
internal StorageEnvironment _environment;

internal TransactionContextPool _contextPool;

Expand Down
3 changes: 1 addition & 2 deletions src/Raven.Server/ServerWide/ServerStore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ public class ServerStore : IDisposable

public CancellationToken ServerShutdown => _shutdownNotification.Token;

internal StorageEnvironment Env => _env;
private StorageEnvironment _env;
internal StorageEnvironment _env;

private readonly NotificationsStorage _notificationsStorage;
private readonly OperationsStorage _operationsStorage;
Expand Down
16 changes: 8 additions & 8 deletions test/SlowTests/ExtensionPoints/ExtensionPointsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ namespace SlowTests.ExtensionPoints
{
public class ExtensionPointsTests : RavenTestBase
{
public const string SystemDbName = "System";
private const string SystemDbName = "System";

[Fact]
[Fact(Skip = "https://github.com/dotnet/corefx/issues/30691")]
public async Task OnDirectoryInitializeInMemoryTest()
{
string script;
Expand Down Expand Up @@ -76,7 +76,7 @@ public async Task OnDirectoryInitializeInMemoryTest()

foreach (var index in indexes)
{
var expected = $"{DirectoryExecUtils.EnvironmentType.Index} {store.Database} {index.Env.Options.BasePath} {index.Env.Options.TempPath} {index.Env.Options.JournalPath}";
var expected = $"{DirectoryExecUtils.EnvironmentType.Index} {store.Database} {index._environment.Options.BasePath} {index._environment.Options.TempPath} {index._environment.Options.JournalPath}";
var indexToRemove = matches.FindIndex(str => str.Contains(expected));
if (indexToRemove != -1)
matches.RemoveAt(indexToRemove);
Expand All @@ -87,7 +87,7 @@ public async Task OnDirectoryInitializeInMemoryTest()
}
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/corefx/issues/30691")]
public async Task OnDirectoryInitializePersistedTest()
{
string script;
Expand Down Expand Up @@ -119,7 +119,7 @@ public async Task OnDirectoryInitializePersistedTest()

UseNewLocalServer(customSettings: customSettings, runInMemory: false);
var basePath = NewDataPath();

using (var store = GetDocumentStore(new Options
{
Path = basePath
Expand All @@ -129,11 +129,11 @@ public async Task OnDirectoryInitializePersistedTest()

// The database loads after all indexes are loaded
var documentDatabase = await Server.ServerStore.DatabasesLandlord.TryGetOrCreateResourceStore(store.Database);

var lines = File.ReadAllLines(outputFile);
Assert.True(lines.Length == 6);

var systemEnvOptions = Server.ServerStore.Env.Options;
var systemEnvOptions = Server.ServerStore._env.Options;
var configEnvOptions = documentDatabase.ConfigurationStorage.Environment.Options;
var docsEnvOptions = documentDatabase.DocumentsStorage.Environment.Options;

Expand All @@ -150,7 +150,7 @@ public async Task OnDirectoryInitializePersistedTest()

foreach (var index in indexes)
{
var expected =$"{DirectoryExecUtils.EnvironmentType.Index} {store.Database} {index.Env.Options.BasePath} {index.Env.Options.TempPath} {index.Env.Options.JournalPath}";
var expected = $"{DirectoryExecUtils.EnvironmentType.Index} {store.Database} {index._environment.Options.BasePath} {index._environment.Options.TempPath} {index._environment.Options.JournalPath}";
var indexToRemove = matches.FindIndex(str => str.Contains(expected));
if (indexToRemove != -1)
matches.RemoveAt(indexToRemove);
Expand Down

0 comments on commit 830d346

Please sign in to comment.