From 6262b044a416e5a6be5f8ea717885ecac2821b96 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 21 Jan 2015 09:09:49 +0100 Subject: [PATCH 1/2] test fix attempt --- .../shell-compaction-noncluster-timecritical.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/js/server/tests/shell-compaction-noncluster-timecritical.js b/js/server/tests/shell-compaction-noncluster-timecritical.js index 3993501cd5..3e3a1c506b 100644 --- a/js/server/tests/shell-compaction-noncluster-timecritical.js +++ b/js/server/tests/shell-compaction-noncluster-timecritical.js @@ -618,8 +618,17 @@ function CompactionSuite () { var doc = c1.document("test1"); c1.rotate(); - - var fig = c1.figures(); + + var tries = 0, fig; + + while (++tries < 20) { + fig = c1.figures(); + if (fig["alive"]["count"] === n / 2 && fig["dead"]["count"] === 0) { + break; + } + internal.wait(1, false); + } + assertEqual(n / 2, c1.count()); assertEqual(n / 2, fig["alive"]["count"]); assertEqual(0, fig["dead"]["count"]); From 98de75658be20dabdc86a6b427a0be21cedbcec9 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 21 Jan 2015 09:28:35 +0100 Subject: [PATCH 2/2] updated CHANGELOG --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 2a8dacfe5e..48895e30d3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,7 +20,7 @@ v2.5.0 (XXXX-XX-XX) behavior. -v2.4.1 (XXXX-XX-XX) +v2.4.1 (2015-01-19) ------------------- * improved WAL recovery output