You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by dc...@apache.org on 2012/12/14 03:02:16 UTC
[3/3] git commit: Use non-compressed Content-Type in attachments test
suites
Use non-compressed Content-Type in attachments test suites
MD5-Digests of attachments are calculated on the compressed data if the
attachment MIME type is compressible, as defined in default.ini
[attachments] compressible_types
Windows uses a different gzip implementation, and therefore generates
different MD5-Digests than other platforms. Using binary Content-Type
resolves this.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7941046a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7941046a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7941046a
Branch: refs/heads/1.3.x
Commit: 7941046aed824de89fa1cafbb4b063095fe192f1
Parents: a8aff9f
Author: Dave Cottlehuber <dc...@apache.org>
Authored: Sun Jan 15 23:38:13 2012 +0100
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Thu Dec 13 16:20:26 2012 +0100
----------------------------------------------------------------------
share/www/script/test/attachment_names.js | 6 +++---
share/www/script/test/attachments.js | 10 +++++++---
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/7941046a/share/www/script/test/attachment_names.js
----------------------------------------------------------------------
diff --git a/share/www/script/test/attachment_names.js b/share/www/script/test/attachment_names.js
index fb5f18f..c9a5fcc 100644
--- a/share/www/script/test/attachment_names.js
+++ b/share/www/script/test/attachment_names.js
@@ -20,7 +20,7 @@ couchTests.attachment_names = function(debug) {
_id: "good_doc",
_attachments: {
"Колян.txt": {
- content_type:"text/plain",
+ content_type:"application/octet-stream",
data: "VGhpcyBpcyBhIGJhc2U2NCBlbmNvZGVkIHRleHQ="
}
}
@@ -31,8 +31,8 @@ couchTests.attachment_names = function(debug) {
var xhr = CouchDB.request("GET", "/test_suite_db/good_doc/Колян.txt");
T(xhr.responseText == "This is a base64 encoded text");
- T(xhr.getResponseHeader("Content-Type") == "text/plain");
- TEquals("\"qUUYqS41RhwF0TrCsTAxFg==\"", xhr.getResponseHeader("Etag"));
+ T(xhr.getResponseHeader("Content-Type") == "application/octet-stream");
+ TEquals("\"aEI7pOYCRBLTRQvvqYrrJQ==\"", xhr.getResponseHeader("Etag"));
var binAttDoc = {
_id: "bin_doc",
http://git-wip-us.apache.org/repos/asf/couchdb/blob/7941046a/share/www/script/test/attachments.js
----------------------------------------------------------------------
diff --git a/share/www/script/test/attachments.js b/share/www/script/test/attachments.js
index a409f82..db4524a 100644
--- a/share/www/script/test/attachments.js
+++ b/share/www/script/test/attachments.js
@@ -16,11 +16,15 @@ couchTests.attachments= function(debug) {
db.createDb();
if (debug) debugger;
+
+ // MD5 Digests of compressible attachments and therefore Etags
+ // will vary depending on platform gzip implementation.
+ // These MIME types are defined in [attachments] compressible_types
var binAttDoc = {
_id: "bin_doc",
_attachments:{
"foo.txt": {
- content_type:"text/plain",
+ content_type:"application/octet-stream",
data: "VGhpcyBpcyBhIGJhc2U2NCBlbmNvZGVkIHRleHQ="
}
}
@@ -31,8 +35,8 @@ couchTests.attachments= function(debug) {
var xhr = CouchDB.request("GET", "/test_suite_db/bin_doc/foo.txt");
T(xhr.responseText == "This is a base64 encoded text");
- T(xhr.getResponseHeader("Content-Type") == "text/plain");
- TEquals("\"qUUYqS41RhwF0TrCsTAxFg==\"", xhr.getResponseHeader("Etag"));
+ T(xhr.getResponseHeader("Content-Type") == "application/octet-stream");
+ TEquals("\"aEI7pOYCRBLTRQvvqYrrJQ==\"", xhr.getResponseHeader("Etag"));
// empty attachment
var binAttDoc2 = {