Merge branch 'New3' of https://github.com/ppekrol/ravendb into New3

ravendb · Feb 7, 2014 · 54a7623 · 54a7623
2 parents bad6b68 + b36f424
commit 54a7623
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Raven.Database/Config/InMemoryRavenConfiguration.cs b/Raven.Database/Config/InMemoryRavenConfiguration.cs
@@ -919,7 +919,12 @@ public ITransactionalStorage CreateTransactionalStorage(string storageEngine, Ac
 		public string SelectStorageEngine()
 		{
 			if (RunInMemory)
-				return typeof(Raven.Storage.Managed.TransactionalStorage).AssemblyQualifiedName;
+			{
+                if (!string.IsNullOrEmpty(DefaultStorageTypeName) && DefaultStorageTypeName.Equals("voron", StringComparison.InvariantCultureIgnoreCase))
+                    return typeof(Raven.Storage.Voron.TransactionalStorage).AssemblyQualifiedName;
+
+                return typeof(Raven.Storage.Managed.TransactionalStorage).AssemblyQualifiedName;
+			}
 
 			if (String.IsNullOrEmpty(DataDirectory) == false && Directory.Exists(DataDirectory))
 			{

diff --git a/Raven.Tests/Bundles/Replication/Issues/RavenDB_677.cs b/Raven.Tests/Bundles/Replication/Issues/RavenDB_677.cs
@@ -54,7 +54,8 @@ public void CanDeleteTombstonesButNotAfterTheSpecifiedEtag(string requestedStora
             store1.DatabaseCommands.Delete("rahien", null);
             servers[0].SystemDatabase.TransactionalStorage.Batch(accessor =>
             {
-                Assert.Equal(2, accessor.Lists.Read(Constants.RavenReplicationDocsTombstones, Etag.Empty, null, 10).Count());
+                var count = accessor.Lists.Read(Constants.RavenReplicationDocsTombstones, Etag.Empty, null, 10).Count();
+                Assert.Equal(2, count);
             });
 
             Etag last = Etag.Empty.Setup(UuidType.Documents, 1).IncrementBy(3);