fix nocommits

src/test/java/org/elasticsearch/NamingConventionTests.java

@@ -43,7 +43,6 @@ import java.util.Set;
 /**
  * Simple class that ensures that all subclasses concrete of ElasticsearchTestCase end with either Test | Tests
  */
-@LuceneTestCase.SuppressFileSystems("*") // nocommit: ignore rules aren't working for some reason with mockfs
 public class NamingConventionTests extends ElasticsearchTestCase {
 
     // see https://github.com/elasticsearch/elasticsearch/issues/9945

src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java

@@ -163,7 +163,6 @@ public class FileSystemUtilsTests extends ElasticsearchTestCase {
     }
 
     @Test
-    @AwaitsFix(bugUrl = "FilterPath equality?") // nocommit: mockfs causes FilterPaths here, but the equality doesnt seem to work 
     public void testAppend() {
         assertEquals(FileSystemUtils.append(PathUtils.get("/foo/bar"), PathUtils.get("/hello/world/this_is/awesome"), 0),
             PathUtils.get("/foo/bar/hello/world/this_is/awesome"));

src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java

@@ -47,7 +47,7 @@ import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF
 import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
 import static org.hamcrest.CoreMatchers.equalTo;
 
-@LuceneTestCase.SuppressFileSystems("*") // nocommit: equality of paths with mockfs doesn't seem to work right, the got/expected are printed exactly the same...
+@LuceneTestCase.SuppressFileSystems("ExtrasFS") // TODO: fix test to allow extras
 public class NodeEnvironmentTests extends ElasticsearchTestCase {
 
     private final Settings idxSettings = ImmutableSettings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).build();

src/test/java/org/elasticsearch/gateway/GatewayIndexStateTests.java

@@ -53,7 +53,6 @@ import static org.hamcrest.Matchers.nullValue;
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
 @Slow
-@LuceneTestCase.SuppressFileSystems("*") // nocommit: no idea...no exceptions, just 0 results from searches
 public class GatewayIndexStateTests extends ElasticsearchIntegrationTest {
 
     private final ESLogger logger = Loggers.getLogger(GatewayIndexStateTests.class);

src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java

@@ -18,7 +18,6 @@
  */
 package org.elasticsearch.gateway;
 
-import com.carrotsearch.randomizedtesting.LifecycleScope;
 import com.google.common.collect.Iterators;
 
 import org.apache.lucene.codecs.CodecUtil;
@@ -73,7 +72,7 @@ import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.startsWith;
 
-@LuceneTestCase.SuppressFileSystems("*") // nocommit: lots of checks on number of files in a dir here, but suppressing ExtraFS doesn't seem to work?
+@LuceneTestCase.SuppressFileSystems("ExtrasFS") // TODO: fix test to work with ExtrasFS
 public class MetaDataStateFormatTest extends ElasticsearchTestCase {
 
 

src/test/java/org/elasticsearch/gateway/QuorumGatewayTests.java

@@ -47,7 +47,6 @@ import static org.hamcrest.Matchers.*;
  *
  */
 @ClusterScope(numDataNodes =0, scope= Scope.TEST)
-@SuppressFileSystems("*") // nocommit: no idea what is happening here...
 public class QuorumGatewayTests extends ElasticsearchIntegrationTest {
 
     @Override

src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayTests.java

@@ -19,7 +19,6 @@
 
 package org.elasticsearch.gateway;
 
-import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.LuceneTestCase.Slow;
 import org.elasticsearch.action.admin.indices.recovery.RecoveryResponse;
 import org.elasticsearch.action.admin.indices.recovery.ShardRecoveryResponse;
@@ -59,7 +58,6 @@ import static org.hamcrest.Matchers.notNullValue;
  */
 @ClusterScope(numDataNodes = 0, scope = Scope.TEST)
 @Slow
-@LuceneTestCase.SuppressFileSystems("*") // nocommit: no idea...
 public class RecoveryFromGatewayTests extends ElasticsearchIntegrationTest {
 
     @Test

src/test/java/org/elasticsearch/index/store/CorruptedTranslogTests.java

@@ -22,7 +22,6 @@ package org.elasticsearch.index.store;
 import com.carrotsearch.ant.tasks.junit4.dependencies.com.google.common.collect.Lists;
 import com.carrotsearch.randomizedtesting.generators.RandomPicks;
 
-import org.apache.lucene.util.LuceneTestCase;
 import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse;
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.SearchPhaseExecutionException;
@@ -59,7 +58,6 @@ import static org.hamcrest.Matchers.notNullValue;
  * Integration test for corrupted translog files
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope= ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 0)
-@LuceneTestCase.SuppressFileSystems("*") // nocommit: corrupting the translog doesn't find a file to corrupt, path building/comparison seems broken
 public class CorruptedTranslogTests extends ElasticsearchIntegrationTest {
 
     @Override

src/test/java/org/elasticsearch/index/translog/AbstractSimpleTranslogTests.java

@@ -332,7 +332,6 @@ public abstract class AbstractSimpleTranslogTests extends ElasticsearchTestCase
     }
 
     @Test
-    @AwaitsFix(bugUrl = "sometimes translog doesn't exist...") // nocommit
     public void deleteOnRollover() throws IOException {
         translog.add(new Translog.Create("test", "1", new byte[]{1}));
 

src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java

@@ -19,7 +19,6 @@
 
 package org.elasticsearch.index.translog;
 
-import org.apache.lucene.util.LuceneTestCase;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.index.VersionType;
 import org.elasticsearch.test.ElasticsearchTestCase;
@@ -34,10 +33,6 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  * Tests for reading old and new translog files
  */
-@LuceneTestCase.SuppressFileSystems("*") // nocommit: really??
-// file handle leaks: [InputStream(/Users/rjernst/Code/elasticsearch/target/test-classes/org/elasticsearch/index/translog/translog-v1.binary), InputStream(/Users/rjernst/Code/elasticsearch/target/test-classes/org/elasticsearch/index/translog/translog-v0.binary)]
-// > 	at __randomizedtesting.SeedInfo.seed([5C01B578E6A55900]:0)
-// > 	at org.apache.lucene.mockfile.LeakFS.onClose(LeakFS.java:64)
 public class TranslogVersionTests extends ElasticsearchTestCase {
 
     @Test
@@ -71,6 +66,7 @@ public class TranslogVersionTests extends ElasticsearchTestCase {
         } catch (EOFException e) {
             // success
         }
+        in.close();
     }
 
     @Test
@@ -106,6 +102,7 @@ public class TranslogVersionTests extends ElasticsearchTestCase {
             }
         }
         assertThat("there should be 5 translog operations", opNum, equalTo(5));
+        in.close();
     }
 
     @Test

src/test/java/org/elasticsearch/indices/IndicesCustomDataPathTests.java

@@ -44,7 +44,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  * Tests for custom data path locations and templates
  */
-@LuceneTestCase.SuppressFileSystems("ExtrasFS") //nocommit: assertPathHasBeenCleared seems like a bad method altogether, should it be agnostic to extra files that already existed?
+@LuceneTestCase.SuppressFileSystems("ExtrasFS") //TODO: assertPathHasBeenCleared seems like a bad method altogether, should it be agnostic to extra files that already existed?
 public class IndicesCustomDataPathTests extends ElasticsearchIntegrationTest {
 
     private String path;

src/test/java/org/elasticsearch/plugins/PluginManagerTests.java

@@ -63,7 +63,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
 
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0, transportClientRatio = 0.0)
-@LuceneTestCase.SuppressFileSystems("*") // nocommit: lots of failures here, some with provider mismatches...
+@LuceneTestCase.SuppressFileSystems("ExtrasFS") // TODO: clean up this test to allow extra files
 public class PluginManagerTests extends ElasticsearchIntegrationTest {
 
     @Test(expected = ElasticsearchIllegalArgumentException.class)

src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java

@@ -81,9 +81,6 @@ import static org.hamcrest.Matchers.*;
 /**
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
-@LuceneTestCase.SuppressFileSystems("*") // nocommit: "not all files were deleted during snapshot cancellation"
-// possibly something messed up with comparison somewhere...
-// org.elasticsearch.common.settings.NoClassSettingsException: failed to load class with value [mock]; tried [mock, org.elasticsearch.repositories.MockRepositoryModule, org.elasticsearch.repositories.mock.MockRepositoryModule, org.elasticsearch.repositories.mock.MockRepositoryModule]
 public class DedicatedClusterSnapshotRestoreTests extends AbstractSnapshotTests {
 
     @Test