Skip to content
This repository has been archived by the owner on Apr 13, 2022. It is now read-only.

Integrate NVHTests and NVSTests in BlockchainSanity #110

Merged
merged 15 commits into from
Dec 8, 2017
Merged

Conversation

kushti
Copy link
Contributor

@kushti kushti commented Nov 13, 2017

No description provided.

ceilican and others added 9 commits November 3, 2017 12:00
…ompiling.

[error] /Users/Bruno/Dropbox/Code/Scorex/testkit/src/main/scala/scorex/testkit/BlockchainSanity.scala:39:10: illegal inheritance; superclass PropSpec
[error]  is not a subclass of the superclass PropSpec
[error]  of the mixin trait NodeViewHolderTests
[error]     with NodeViewHolderTests[P, TX, PM, ST, SI, HT, MPool]
[error]          ^
[error] /Users/Bruno/Dropbox/Code/Scorex/testkit/src/main/scala/scorex/testkit/BlockchainSanity.scala:40:10: illegal inheritance; superclass PropSpec
[error]  is not a subclass of the superclass PropSpec
[error]  of the mixin trait NodeViewSynchronizerTests
[error]     with NodeViewSynchronizerTests[P, TX, PM, ST, SI, HT] {
[error]          ^
[error] two errors found
[error] (testkit/compile:compileIncremental) Compilation failed
Integrate NVHTests and NVSTests in BlockchainSanity
@kushti kushti requested a review from catena2w November 23, 2017 19:30
Copy link
Contributor

@catena2w catena2w left a comment

Choose a reason for hiding this comment

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

Style fixes required

val fixture = new HolderFixture
try {
testCode(fixture)
}
Copy link
Contributor

Choose a reason for hiding this comment

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

We use one line codestyle, like
} finally {

@ceilican
Copy link
Contributor

ceilican commented Dec 1, 2017

See #118 . I don't have push access to this repo. That's why I couldn't push the fix directly into this pull request.

@ceilican
Copy link
Contributor

ceilican commented Dec 1, 2017

This is the test that failed:

[info] - NodeViewHolder: forking - switching *** FAILED ***
[info]   java.lang.NullPointerException:
[info]   at scorex.testkit.properties.NodeViewHolderTests.$anonfun$$init$$39(NodeViewHolderTests.scala:239)
[info]   at scorex.testkit.properties.NodeViewHolderTests.$anonfun$$init$$39$adapted(NodeViewHolderTests.scala:211)
[info]   at scorex.testkit.properties.NodeViewHolderTests.withFixture(NodeViewHolderTests.scala:47)
[info]   at scorex.testkit.properties.NodeViewHolderTests.$anonfun$$init$$38(NodeViewHolderTests.scala:211)
[info]   at scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.java:12)
[info]   at org.scalatest.OutcomeOf.outcomeOf(OutcomeOf.scala:85)
[info]   at org.scalatest.OutcomeOf.outcomeOf$(OutcomeOf.scala:83)
[info]   at org.scalatest.OutcomeOf$.outcomeOf(OutcomeOf.scala:104)
[info]   at org.scalatest.Transformer.apply(Transformer.scala:22)
[info]   at org.scalatest.Transformer.apply(Transformer.scala:20)
[info]   ...

@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 19d9f9e on more-props into ** on master**.

@ceilican
Copy link
Contributor

ceilican commented Dec 1, 2017

Ok. I re-executed the failing build in Travis, and it succeeded this time...

@coveralls
Copy link

Coverage Status

Coverage increased (+0.06%) to 45.681% when pulling f8ac41a on more-props into f66dd57 on master.

@ceilican
Copy link
Contributor

ceilican commented Dec 8, 2017

@catena2w I fixed the style, as you requested.

@kushti I fresolved the conflict.

@catena2w @kushti, I think this PR can be accepted now.

@ceilican
Copy link
Contributor

ceilican commented Dec 8, 2017

I removed the obsolete failing test.

There is another test that sometimes fails, but this is not caused by this MR. The problem is discussed here (#119).

@coveralls
Copy link

Coverage Status

Coverage remained the same at 45.532% when pulling 25221be on more-props into a8cf1ef on master.

@catena2w catena2w merged commit 503557f into master Dec 8, 2017
@catena2w catena2w deleted the more-props branch December 8, 2017 14:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants