Issue 4575 - Fix failing tests in buildtools

tests/test_packagerEdge.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import ConfigParser
 import json
 import os
 import shutil
 import xml.etree.ElementTree as ET
 import zipfile
@@ skipping 101 matching lines @@
 
 def test_full_content_types_map():
     filenames = ['no-extension', packagerEdge.MANIFEST, packagerEdge.BLOCKMAP]
     filenames += ['file.' + x for x in 'json html js png css git otf'.split()]
     ctm_dict = ctm2dict(packagerEdge.create_content_types_map(filenames))
     assert ctm_dict['defaults'] == {
         'css': 'text/css',
         'html': 'text/html',
         'js': 'application/javascript',
         'json': 'application/json',
-        'otf': 'application/x-font-otf',
+        'otf': 'application/octet-stream',
         'png': 'image/png',
         'xml': 'application/xml'
     }
     assert ctm_dict['overrides'] == {
         '/AppxBlockMap.xml': 'application/vnd.ms-appx.blockmap+xml',
         '/AppxManifest.xml': 'application/vnd.ms-appx.manifest+xml'
     }
 
 
 def test_create_appx_manifest(metadata, files):
@@ skipping 38 matching lines @@
     assert 'devbuild-marker' not in appx.read('AppxManifest.xml')
     assert appx.read('Assets/logo_44.png') == '44'
     assert appx.read('Extension/icons/abp-44.png') == '44'
 
 
 def test_create_devbuild(tmpdir, srcdir):
     out_file = str(tmpdir.join('abp.appx'))
     packagerEdge.createBuild(str(srcdir), outFile=out_file, releaseBuild=False)
     appx = zipfile.ZipFile(out_file)
     assert 'devbuild-marker' in appx.read('AppxManifest.xml')