Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix unit tests

  • Loading branch information...
commit 17f53856e40ac57658ac05e52558e07563a69c6c 1 parent 09f0165
Kyle Maxwell authored
View
2  src/test/scala/com/twitter/flockdb/integration/FlockFixRegressionSpec.scala
@@ -61,7 +61,7 @@ class FlockFixRegressionSpec extends IntegrationSpecification {
alicesFollowings().size must eventually(be_==(5))
alicesFollowings().toList.map(_.destination_id) mustEqual List(8,6,4,2,0)
- Time.now += 1.second
+ Thread.sleep(1000)
val job = Unarchive(alice, FOLLOWS, Direction.Forward, Time.now, flockdb.Priority.High, pageSize, flock.edges.forwardingManager, flock.edges.schedule)
job()
View
4 src/test/scala/com/twitter/flockdb/unit/SqlShardSpec.scala
@@ -344,11 +344,13 @@ class SqlShardSpec extends IntegrationSpecification with JMocker {
"when the row already exists" >> {
"when the already-existing row is older than the row to be inserted" >> {
+
+ // Flock-fix redefines a re-insert as a no-op
"when the already existing row is not deleted" >> {
shard.add(alice, bob, 1, now)
shard.add(alice, bob, 2, now + 10.seconds)
- shard.get(alice, bob) mustEqual Some(new Edge(alice, bob, 2, now + 10.seconds, 0, State.Normal))
+ shard.get(alice, bob) mustEqual Some(new Edge(alice, bob, 1, now + 10.seconds, 0, State.Normal))
}
"when the already existing row is not archived" >> {
Please sign in to comment.
Something went wrong with that request. Please try again.