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.
janl · Dec 14, 2012 · c0d20c1 · c0d20c1
1 parent 6c3c7b8
commit c0d20c1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git 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",

diff --git 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 = {