summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul J. Davis <paul.joseph.davis@gmail.com>2014-08-12 16:00:39 -0500
committerPaul J. Davis <paul.joseph.davis@gmail.com>2014-08-12 16:00:39 -0500
commited4f4961a3d305c236081bb587c0cc1bdd9f72ec (patch)
tree399cfe4896a5fb240793947a6780d3d3c9efca52
parent16b7ecfb9410157159f69ed59e64f359404a49a0 (diff)
downloadcouchdb-ed4f4961a3d305c236081bb587c0cc1bdd9f72ec.tar.gz
Use the correct sequence for replication status
The value of source_seq is just what's been seen, not what's actually been stored on the target. We expose through_seq now to show the actual progress.
-rw-r--r--share/www/script/test/replication.js16
1 files changed, 3 insertions, 13 deletions
diff --git a/share/www/script/test/replication.js b/share/www/script/test/replication.js
index c88337489..21a430452 100644
--- a/share/www/script/test/replication.js
+++ b/share/www/script/test/replication.js
@@ -175,7 +175,7 @@ couchTests.replication = function(debug) {
do {
var task = getTask(rep_id, 0);
- if(task && task["source_seq"] == sourceSeq) {
+ if(task && task["through_seq"] == sourceSeq) {
return;
}
t1 = new Date();
@@ -1385,19 +1385,9 @@ couchTests.replication = function(debug) {
while (sourceDb.info().compact_running) {};
TEquals(true, sourceDb.save(makeDocs(30, 31)[0]).ok);
- xhr = CouchDB.request("GET", "/_active_tasks");
- var xhr = CouchDB.request("GET", "/_active_tasks");
- var tasks = JSON.parse(xhr.responseText);
-
- var found_task = false;
- for(var i = 0; i < tasks.length; i++) {
- if(tasks[i].replication_id == repResult._local_id) {
- found_task = true;
- break;
- }
- }
- TEquals(true, found_task);
+ var task = getTask(repResult._local_id, 1000);
+ T(task != null);
waitForSeq(sourceDb, targetDb, repResult._local_id);
T(sourceDb.open("30") !== null);