summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoan Touzet <wohali@users.noreply.github.com>2020-01-08 16:41:52 -0500
committerGitHub <noreply@github.com>2020-01-08 16:41:52 -0500
commit9d607829299478af4b446eb9c9610323ce96e2b1 (patch)
tree6be051526ade5713f755dba1e78f85b9d73c8597
parent5cf84b5a664ba654c81e8a52b0ae075e1e8b9127 (diff)
parentc4d4590dee9e30807445dda8e3ac157bef3c37d9 (diff)
downloadcouchdb-fix/2143/override-query-server-config.tar.gz
Merge branch 'master' into fix/2143/override-query-server-configfix/2143/override-query-server-config
-rwxr-xr-xtest/javascript/run2
-rw-r--r--test/javascript/tests/design_docs.js6
2 files changed, 5 insertions, 3 deletions
diff --git a/test/javascript/run b/test/javascript/run
index ac49e3ace..a465a7b68 100755
--- a/test/javascript/run
+++ b/test/javascript/run
@@ -58,7 +58,7 @@ def mkformatter(tests):
elif rval == 3:
return green + "ported to elixir" + clear
else:
- return red + "fail" + clear
+ return red + ("fail: %d" % rval) + clear
def _fmt(test):
if isinstance(test, str):
diff --git a/test/javascript/tests/design_docs.js b/test/javascript/tests/design_docs.js
index e28cb2e83..55e592a18 100644
--- a/test/javascript/tests/design_docs.js
+++ b/test/javascript/tests/design_docs.js
@@ -427,10 +427,12 @@ couchTests.design_docs = function(debug) {
ddoc._deleted = true;
TEquals(true, db.save(ddoc).ok);
+ var resp = db.save({_id: "doc1", value: 4})
try {
- TEquals(true, db.save({_id: "doc1", value: 4}).ok);
+ TEquals(true, resp.ok);
} catch (x) {
- T(false, "doc insertion should have succeeded");
+ resp = JSON.stringify(resp)
+ T(false, "doc insertion should have succeeded: " + resp);
}
doc = db.open("doc1");