Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

This commit is contained in:
Willi Goesgens 2015-01-21 09:36:11 +01:00
parent dabd986fcc 98de75658b
commit f4ba020193
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -20,7 +20,7 @@ v2.5.0 (XXXX-XX-XX)
behavior. behavior.
v2.4.1 (XXXX-XX-XX) v2.4.1 (2015-01-19)
------------------- -------------------
* improved WAL recovery output * improved WAL recovery output

13
js/server/tests/shell-compaction-noncluster-timecritical.js
View File

@ -618,8 +618,17 @@ function CompactionSuite () {
var doc = c1.document("test1"); var doc = c1.document("test1");
c1.rotate(); 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, c1.count());
assertEqual(n / 2, fig["alive"]["count"]); assertEqual(n / 2, fig["alive"]["count"]);
assertEqual(0, fig["dead"]["count"]); assertEqual(0, fig["dead"]["count"]);