Merge branch '6.x' into ccr-6.x

dnhatn · dnhatn · commit 2e248a70eb3b · 2018-06-01T23:07:59.000-04:00
* 6.x:
  Avoid randomization bug in FeatureAwareTests
diff --git a/server/src/test/java/org/elasticsearch/cluster/FeatureAwareTests.java b/server/src/test/java/org/elasticsearch/cluster/FeatureAwareTests.java
@@ -107,7 +107,7 @@ public Optional<String> getRequiredFeature() {
     }
 
     public void testVersion() {
-        final Version version = VersionUtils.randomVersion(random());
+        final Version version = randomValueOtherThan(VersionUtils.getFirstVersion(), () -> VersionUtils.randomVersion(random()));
         for (final Custom custom : Arrays.asList(new NoRequiredFeatureCustom(version), new RequiredFeatureCustom(version))) {
             {
                 final BytesStreamOutput out = new BytesStreamOutput();

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public Optional<String> getRequiredFeature() {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`public void testVersion() {`
`110`		`- final Version version = VersionUtils.randomVersion(random());`
	`110`	`+ final Version version = randomValueOtherThan(VersionUtils.getFirstVersion(), () -> VersionUtils.randomVersion(random()));`
`111`	`111`	`for (final Custom custom : Arrays.asList(new NoRequiredFeatureCustom(version), new RequiredFeatureCustom(version))) {`
`112`	`112`	`{`
`113`	`113`	`final BytesStreamOutput out = new BytesStreamOutput();`