You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2017/03/20 14:23:02 UTC
[couchdb] branch master updated (6d44bb0 -> 69a71d9)
This is an automated email from the ASF dual-hosted git repository.
jan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
from 6d44bb0 bump couchdb-documentation dependency
new dad4782 chore: whitespace
new 69a71d9 fix(test): wait for auth-cache
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
test/javascript/tests/replication.js | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].
[couchdb] 01/02: chore: whitespace
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit dad47829b3ea535e433996c5a6c629c039e40092
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Mon Mar 20 15:06:46 2017 +0100
chore: whitespace
---
test/javascript/tests/replication.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/javascript/tests/replication.js b/test/javascript/tests/replication.js
index 6393acf..3d53dc6 100644
--- a/test/javascript/tests/replication.js
+++ b/test/javascript/tests/replication.js
@@ -15,7 +15,7 @@ couchTests.replication = function(debug) {
if (debug) debugger;
var host = CouchDB.host;
- // as we change names during execution, do NOT use test_suite_db or a
+ // as we change names during execution, do NOT use test_suite_db or a
// pre-computed value like ''+sourceDb.name (compute only on use)
var sourceDb;
var targetDb;
@@ -60,17 +60,17 @@ couchTests.replication = function(debug) {
return data;
}
-
+
function runAllNodes(callback) {
// new and fancy: clustered version: pull cluster_members and walk over all of them
- var xhr = CouchDB.request("GET", "/_membership");
+ var xhr = CouchDB.request("GET", "/_membership");
T(xhr.status === 200);
JSON.parse(xhr.responseText).cluster_nodes.forEach(callback);
}
function runFirstNode(callback) {
// new and fancy: clustered version: pull cluster_members and walk over all of them
- var xhr = CouchDB.request("GET", "/_membership");
+ var xhr = CouchDB.request("GET", "/_membership");
T(xhr.status === 200);
var node = JSON.parse(xhr.responseText).cluster_nodes[0];
return callback(node);
@@ -132,7 +132,7 @@ couchTests.replication = function(debug) {
sourceDb.deleteDb();
}
sourceDb = new CouchDB(get_random_db_name() + "_src",{"X-Couch-Full-Commit":"false"});
- sourceDb.createDb();
+ sourceDb.createDb();
}
for (var i = 0; i < docs.length; i++) {
var doc = docs[i];
@@ -1892,6 +1892,6 @@ couchTests.replication = function(debug) {
//usersDb.deleteDb();
sourceDb.deleteDb();
targetDb.deleteDb();
- // (not sure what this is - cleanup after 'file not found tests' poss. - not harmful anyway)
+ // (not sure what this is - cleanup after 'file not found tests' poss. - not harmful anyway)
(new CouchDB("test_suite_db")).deleteDb();
};
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb] 02/02: fix(test): wait for auth-cache
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 69a71d976081cefb25903fd3165de821fc20c86c
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Mon Mar 20 15:21:40 2017 +0100
fix(test): wait for auth-cache
---
test/javascript/tests/replication.js | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/test/javascript/tests/replication.js b/test/javascript/tests/replication.js
index 3d53dc6..b51a708 100644
--- a/test/javascript/tests/replication.js
+++ b/test/javascript/tests/replication.js
@@ -1606,8 +1606,10 @@ couchTests.replication = function(debug) {
if (prevJoeUserDoc) {
joeUserDoc._rev = prevJoeUserDoc._rev;
}
- TEquals(true, defaultUsersDb.save(joeUserDoc).ok);
-
+ if(i == 0) {
+ TEquals(true, defaultUsersDb.save(joeUserDoc).ok);
+ wait(5000);
+ }
TEquals(true, CouchDB.login("joe", "erly").ok);
TEquals('joe', CouchDB.session().userCtx.name);
@@ -1683,7 +1685,10 @@ couchTests.replication = function(debug) {
if (prevJoeUserDoc) {
joeUserDoc._rev = prevJoeUserDoc._rev;
}
- TEquals(true, defaultUsersDb.save(joeUserDoc).ok);
+ if(i == 0) {
+ TEquals(true, defaultUsersDb.save(joeUserDoc).ok);
+ wait(5000);
+ }
TEquals(true, CouchDB.login("joe", "erly").ok);
TEquals('joe', CouchDB.session().userCtx.name);
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.