Skip to content

Various test fixes for 3.2.0#791

Merged
olim7t merged 1 commit into
3.xfrom
3.x_test_fixes
Feb 7, 2017
Merged

Various test fixes for 3.2.0#791
olim7t merged 1 commit into
3.xfrom
3.x_test_fixes

Conversation

@adutra
Copy link
Copy Markdown
Contributor

@adutra adutra commented Jan 25, 2017

Motivation:

Many tests are failing when using recent versions of C* or DSE.

Modifications:

  1. Bump the default C* version to 3.8
  2. Redesign @CassandraVersion and @DseVersion to be able to fully accept
    tick-tock releases and correctly compare them.
  3. Reduce log verbosity for Scassandra tests
  4. Prevent thrift from being enabled for C* >= 4.0
  5. Fix decommission tests with C* >= 3.12

This commit contains contributions by Andrew Tolbert (@tolbertam).

Result:

All tests should pass.

@adutra adutra added this to the 3.2.0 milestone Jan 25, 2017
@adutra adutra changed the title Fix version comparisons in tests Various test fixes for 3.2.0 Jan 25, 2017

private static boolean isThriftSupported(boolean dse, VersionNumber version) {
return
(!dse && version.compareTo(VersionNumber.parse("3.10")) < 0)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think C* 4.0 will be the first version without thrift. It will still be present in 3.10, but not in trunk.

Copy link
Copy Markdown
Contributor

@tolbertam tolbertam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than my comment about C* and Thrift, this looks good to me 👍

}

private static boolean isThriftSupported(boolean dse, VersionNumber version) {
return dse || version.compareTo(VersionNumber.parse("4.0")) < 0;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious, but what is the significance of DSE here? Although all versions of DSE support Thrift at the moment, i imagine that will change too. That being said I think it is fine this way for now.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm just assuming that all versions of DSE support thrift for now, because I don't know when C* 4.0 will get pulled in DSE.

Copy link
Copy Markdown
Contributor

@tolbertam tolbertam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@olim7t
Copy link
Copy Markdown
Contributor

olim7t commented Feb 7, 2017

Redesign CassandraVersion and DseVersion to be able to fully accept tick-tock releases and correctly compare them.

💯 for using a string for the version.

Motivation:

Many tests are failing when using recent versions of C* or DSE.

Modifications:

1) Bump the default C* version to 3.8
2) Redesign @CassandraVersion and @DseVersion to be able to fully accept
tick-tock releases and correctly compare them.
3) Reduce log verbosity for Scassandra tests
4) Prevent thrift from being enabled for C* >= 4.0
5) Fix decommission tests with C* >= 3.12

This commit contains contributions by Andrew Tolbert (@tolbertam).

Result:

All tests should pass.
@olim7t olim7t merged commit a0b86e9 into 3.x Feb 7, 2017
@olim7t olim7t deleted the 3.x_test_fixes branch February 7, 2017 19:28
tolbertam pushed a commit that referenced this pull request Feb 13, 2017
Motivation:

Many tests are failing when using recent versions of C* or DSE.

Modifications:

1) Bump the default C* version to 3.8
2) Redesign @CassandraVersion and @DseVersion to be able to fully accept
tick-tock releases and correctly compare them.
3) Reduce log verbosity for Scassandra tests
4) Prevent thrift from being enabled for C* >= 4.0
5) Fix decommission tests with C* >= 3.12

This commit contains contributions by Andrew Tolbert (@tolbertam).

Result:

All tests should pass.
tolbertam pushed a commit that referenced this pull request Feb 13, 2017
Motivation:

Many tests are failing when using recent versions of C* or DSE.

Modifications:

1) Bump the default C* version to 3.8
2) Redesign @CassandraVersion and @DseVersion to be able to fully accept
tick-tock releases and correctly compare them.
3) Reduce log verbosity for Scassandra tests
4) Prevent thrift from being enabled for C* >= 4.0
5) Fix decommission tests with C* >= 3.12

This commit contains contributions by Andrew Tolbert (@tolbertam).

Result:

All tests should pass.
tolbertam added a commit that referenced this pull request Feb 17, 2017
Backport #791 and remove ambiguity in Cassandra and DSE versions in tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants