You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2016/03/03 19:30:59 UTC

lucene-solr git commit: Fix TestBackwardsCompatibility.testAllVersionsTested to consider 5.5 as an expected version

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x e344ab1d0 -> 89a02361f


Fix TestBackwardsCompatibility.testAllVersionsTested to consider 5.5 as an expected version


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/89a02361
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/89a02361
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/89a02361

Branch: refs/heads/branch_6x
Commit: 89a02361fe5eb6c4ae84a1bf773b72658ecf2f44
Parents: e344ab1
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Fri Mar 4 00:00:37 2016 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Fri Mar 4 00:00:37 2016 +0530

----------------------------------------------------------------------
 .../lucene/index/TestBackwardsCompatibility.java  | 18 ------------------
 1 file changed, 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/89a02361/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
index 57b8d2d..f8956d5 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
@@ -416,24 +416,6 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
       }
     }
 
-    // BEGIN TRUNK ONLY BLOCK
-    // on trunk, the last release of the prev major release is also untested
-    Version lastPrevMajorVersion = null;
-    for (java.lang.reflect.Field field : Version.class.getDeclaredFields()) {
-      if (Modifier.isStatic(field.getModifiers()) && field.getType() == Version.class) {
-        Version v = (Version)field.get(Version.class);
-        Matcher constant = constantPattern.matcher(field.getName());
-        if (constant.matches() == false) continue;
-        if (v.major == Version.LATEST.major - 1 &&
-            (lastPrevMajorVersion == null || v.onOrAfter(lastPrevMajorVersion))) {
-          lastPrevMajorVersion = v;
-        }
-      }
-    }
-    assertNotNull(lastPrevMajorVersion);
-    expectedVersions.remove(lastPrevMajorVersion.toString() + "-cfs");
-    // END TRUNK ONLY BLOCK
-
     Collections.sort(expectedVersions);
 
     // find what versions we are testing


Re: lucene-solr git commit: Fix TestBackwardsCompatibility.testAllVersionsTested to consider 5.5 as an expected version

Posted by Shalin Shekhar Mangar <sh...@gmail.com>.
Strangely, the same seed does not fail on branch_6_0 even though it
has the same trunk-only block of code.

On Fri, Mar 4, 2016 at 2:14 AM, Uwe Schindler <uw...@thetaphi.de> wrote:
> Hi,
>
> This may also need to be backported to 6.0 branch. We just have no jenkins jobs up to now, so this may not have been detected!?
> I will try this out later and commit if needed.
>
> Uwe
>
> -----
> Uwe Schindler
> H.-H.-Meier-Allee 63, D-28213 Bremen
> http://www.thetaphi.de
> eMail: uwe@thetaphi.de
>
>
>> -----Original Message-----
>> From: shalin@apache.org [mailto:shalin@apache.org]
>> Sent: Thursday, March 03, 2016 7:31 PM
>> To: commits@lucene.apache.org
>> Subject: lucene-solr git commit: Fix
>> TestBackwardsCompatibility.testAllVersionsTested to consider 5.5 as an
>> expected version
>>
>> Repository: lucene-solr
>> Updated Branches:
>>   refs/heads/branch_6x e344ab1d0 -> 89a02361f
>>
>>
>> Fix TestBackwardsCompatibility.testAllVersionsTested to consider 5.5 as an
>> expected version
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/lucene-
>> solr/commit/89a02361
>> Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/89a02361
>> Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/89a02361
>>
>> Branch: refs/heads/branch_6x
>> Commit: 89a02361fe5eb6c4ae84a1bf773b72658ecf2f44
>> Parents: e344ab1
>> Author: Shalin Shekhar Mangar <sh...@apache.org>
>> Authored: Fri Mar 4 00:00:37 2016 +0530
>> Committer: Shalin Shekhar Mangar <sh...@apache.org>
>> Committed: Fri Mar 4 00:00:37 2016 +0530
>>
>> ----------------------------------------------------------------------
>>  .../lucene/index/TestBackwardsCompatibility.java  | 18 ------------------
>>  1 file changed, 18 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/lucene-
>> solr/blob/89a02361/lucene/backward-
>> codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
>> ----------------------------------------------------------------------
>> diff --git a/lucene/backward-
>> codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
>> b/lucene/backward-
>> codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
>> index 57b8d2d..f8956d5 100644
>> --- a/lucene/backward-
>> codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
>> +++ b/lucene/backward-
>> codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
>> @@ -416,24 +416,6 @@ public class TestBackwardsCompatibility extends
>> LuceneTestCase {
>>        }
>>      }
>>
>> -    // BEGIN TRUNK ONLY BLOCK
>> -    // on trunk, the last release of the prev major release is also untested
>> -    Version lastPrevMajorVersion = null;
>> -    for (java.lang.reflect.Field field : Version.class.getDeclaredFields()) {
>> -      if (Modifier.isStatic(field.getModifiers()) && field.getType() ==
>> Version.class) {
>> -        Version v = (Version)field.get(Version.class);
>> -        Matcher constant = constantPattern.matcher(field.getName());
>> -        if (constant.matches() == false) continue;
>> -        if (v.major == Version.LATEST.major - 1 &&
>> -            (lastPrevMajorVersion == null || v.onOrAfter(lastPrevMajorVersion)))
>> {
>> -          lastPrevMajorVersion = v;
>> -        }
>> -      }
>> -    }
>> -    assertNotNull(lastPrevMajorVersion);
>> -    expectedVersions.remove(lastPrevMajorVersion.toString() + "-cfs");
>> -    // END TRUNK ONLY BLOCK
>> -
>>      Collections.sort(expectedVersions);
>>
>>      // find what versions we are testing
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>



-- 
Regards,
Shalin Shekhar Mangar.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org


RE: lucene-solr git commit: Fix TestBackwardsCompatibility.testAllVersionsTested to consider 5.5 as an expected version

Posted by Uwe Schindler <uw...@thetaphi.de>.
Hi,

This may also need to be backported to 6.0 branch. We just have no jenkins jobs up to now, so this may not have been detected!?
I will try this out later and commit if needed.

Uwe

-----
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de
eMail: uwe@thetaphi.de


> -----Original Message-----
> From: shalin@apache.org [mailto:shalin@apache.org]
> Sent: Thursday, March 03, 2016 7:31 PM
> To: commits@lucene.apache.org
> Subject: lucene-solr git commit: Fix
> TestBackwardsCompatibility.testAllVersionsTested to consider 5.5 as an
> expected version
> 
> Repository: lucene-solr
> Updated Branches:
>   refs/heads/branch_6x e344ab1d0 -> 89a02361f
> 
> 
> Fix TestBackwardsCompatibility.testAllVersionsTested to consider 5.5 as an
> expected version
> 
> 
> Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
> Commit: http://git-wip-us.apache.org/repos/asf/lucene-
> solr/commit/89a02361
> Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/89a02361
> Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/89a02361
> 
> Branch: refs/heads/branch_6x
> Commit: 89a02361fe5eb6c4ae84a1bf773b72658ecf2f44
> Parents: e344ab1
> Author: Shalin Shekhar Mangar <sh...@apache.org>
> Authored: Fri Mar 4 00:00:37 2016 +0530
> Committer: Shalin Shekhar Mangar <sh...@apache.org>
> Committed: Fri Mar 4 00:00:37 2016 +0530
> 
> ----------------------------------------------------------------------
>  .../lucene/index/TestBackwardsCompatibility.java  | 18 ------------------
>  1 file changed, 18 deletions(-)
> ----------------------------------------------------------------------
> 
> 
> http://git-wip-us.apache.org/repos/asf/lucene-
> solr/blob/89a02361/lucene/backward-
> codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
> ----------------------------------------------------------------------
> diff --git a/lucene/backward-
> codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
> b/lucene/backward-
> codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
> index 57b8d2d..f8956d5 100644
> --- a/lucene/backward-
> codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
> +++ b/lucene/backward-
> codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
> @@ -416,24 +416,6 @@ public class TestBackwardsCompatibility extends
> LuceneTestCase {
>        }
>      }
> 
> -    // BEGIN TRUNK ONLY BLOCK
> -    // on trunk, the last release of the prev major release is also untested
> -    Version lastPrevMajorVersion = null;
> -    for (java.lang.reflect.Field field : Version.class.getDeclaredFields()) {
> -      if (Modifier.isStatic(field.getModifiers()) && field.getType() ==
> Version.class) {
> -        Version v = (Version)field.get(Version.class);
> -        Matcher constant = constantPattern.matcher(field.getName());
> -        if (constant.matches() == false) continue;
> -        if (v.major == Version.LATEST.major - 1 &&
> -            (lastPrevMajorVersion == null || v.onOrAfter(lastPrevMajorVersion)))
> {
> -          lastPrevMajorVersion = v;
> -        }
> -      }
> -    }
> -    assertNotNull(lastPrevMajorVersion);
> -    expectedVersions.remove(lastPrevMajorVersion.toString() + "-cfs");
> -    // END TRUNK ONLY BLOCK
> -
>      Collections.sort(expectedVersions);
> 
>      // find what versions we are testing


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org