summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
Diffstat (limited to 'share')
-rw-r--r--share/www/script/test/bulk_docs.js2
-rw-r--r--share/www/script/test/recreate_doc.js8
2 files changed, 3 insertions, 7 deletions
diff --git a/share/www/script/test/bulk_docs.js b/share/www/script/test/bulk_docs.js
index 88a4313e..972accf3 100644
--- a/share/www/script/test/bulk_docs.js
+++ b/share/www/script/test/bulk_docs.js
@@ -96,5 +96,5 @@ couchTests.bulk_docs = function(debug) {
update = {"_id": newdoc._id, "_rev": newdoc._rev, "body": "blam"};
torem = {"_id": newdoc._id, "_rev": newdoc._rev, "_deleted": true};
results = db.bulkSave([update, torem]);
- T(results[1].error == "conflict");
+ T(results[0].error == "conflict" || results[1].error == "conflict");
};
diff --git a/share/www/script/test/recreate_doc.js b/share/www/script/test/recreate_doc.js
index ca64265d..75e34618 100644
--- a/share/www/script/test/recreate_doc.js
+++ b/share/www/script/test/recreate_doc.js
@@ -29,11 +29,7 @@ couchTests.recreate_doc = function(debug) {
T(db.save(doc).ok);
doc = db.open("foo");
doc.a = "baz";
- try {
- T(db.save(doc).ok);
- } finally {
- // And now, we can't even delete the document anymore :/
- T(db.deleteDoc(doc).rev != undefined);
- }
+ T(db.save(doc).ok);
+ T(db.deleteDoc(doc).rev != undefined);
}
};