Skip to content

Commit

Permalink
Run tests with less concurrency
Browse files Browse the repository at this point in the history
  • Loading branch information
knutwalker committed Apr 7, 2015
1 parent 214d10f commit 86e142e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 3 deletions.
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,19 @@ jdk:
scala:
- 2.11.2

cache:
directories:
- $HOME/.m2/repository
- $HOME/.ivy2/cache
- $HOME/.sbt/boot/

services:
- redis

script:
- sbt ++$TRAVIS_SCALA_VERSION travis
- find $HOME/.sbt -name "*.lock" | xargs rm
- find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm

after_success:
- sbt coveralls
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Travis CI](https://img.shields.io/travis/knutwalker/rx-redis/master.svg)](https://travis-ci.org/knutwalker/rx-redis)
[![Coverage Status](https://img.shields.io/coveralls/knutwalker/rx-redis/master.svg)](https://coveralls.io/r/knutwalker/rx-redis)
[![Maven](https://img.shields.io/maven-central/v/de.knutwalker/rx-redis_2.11.svg)](http://search.maven.org/#search|ga|1|g%3A%22de.knutwalker%22%20AND%20a%3Arx-redis-*_2.11)
[![Maven](https://img.shields.io/maven-central/v/de.knutwalker/rx-redis-scala_2.11.svg)](http://search.maven.org/#search|ga|1|g%3A%22de.knutwalker%22%20AND%20a%3Arx-redis-*_2.11)
[![Apache License](https://img.shields.io/badge/license-APACHE_2-green.svg)](https://www.apache.org/licenses/LICENSE-2.0)

RxRedis
Expand Down
5 changes: 4 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ lazy val tests = project enablePlugins AutomateHeaderPlugin configs (Integration
inConfig(IntegrationTest)(List(fork := true)),
testOptions in Test := List(Tests.Filter(unitFilter)),
testOptions in RegressionTest := List(Tests.Filter(regFilter)),
parallelExecution in Test := false,
parallelExecution in IntegrationTest := false,
scalacOptions in Test += "-Yrangepos",
scalacOptions in IntegrationTest += "-Yrangepos",
name := "rx-redis-tests",
libraryDependencies ++= List(
"org.scalatest" %% "scalatest" % "2.2.4" % "it,test",
Expand Down Expand Up @@ -129,7 +133,6 @@ lazy val commonSettings = List(
"-Ywarn-numeric-widen",
"-Ywarn-unused",
"-Ywarn-unused-import"),
scalacOptions in Test += "-Yrangepos",
scalacOptions in (Compile, console) ~= (_ filterNot (x x == "-Xfatal-warnings" || x.startsWith("-Ywarn"))),
shellPrompt := { state
val name = Project.extract(state).currentRef.project
Expand Down
2 changes: 1 addition & 1 deletion tests/src/it/scala/rx/redis/ThreadSafetySpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import org.scalatest.FunSuite
class ThreadSafetySpec extends FunSuite {

val total = 10000
val threadCount = Runtime.getRuntime.availableProcessors() * 2
val threadCount = 2

private class TestThread(
commandToSend: RespType,
Expand Down

0 comments on commit 86e142e

Please sign in to comment.