Bug 790018 - bump version of manifestdestiny and mirror to m-c;r=mcote

testing/mozbase/manifestdestiny/manifestparser/manifestparser.py

@@ -8,9 +8,6 @@
 Mozilla universal manifest parser
 """
 
-# this file lives at
-# http://hg.mozilla.org/automation/ManifestDestiny/raw-file/tip/manifestparser.py
-
 __all__ = ['read_ini', # .ini reader
            'ManifestParser', 'TestManifest', 'convert', # manifest handling
            'parse', 'ParseError', 'ExpressionParser'] # conditional expression parser
@@ -436,15 +433,15 @@ class ManifestParser(object):
 
             # determine the path
             path = test.get('path', section)
-            relpath = path
+            _relpath = path
             if '://' not in path: # don't futz with URLs
                 path = normalize_path(path)
                 if not os.path.isabs(path):
                     path = os.path.join(here, path)
-                relpath = os.path.relpath(path, self.rootdir)
+                _relpath = relpath(path, self.rootdir)
 
             test['path'] = path
-            test['relpath'] = relpath
+            test['relpath'] = _relpath
 
             # append the item
             self.tests.append(test)

testing/mozbase/manifestdestiny/setup.py

@@ -14,7 +14,7 @@ except:
     description = ''
 
 PACKAGE_NAME = "ManifestDestiny"
-PACKAGE_VERSION = '0.5.5'
+PACKAGE_VERSION = '0.5.6'
 
 setup(name=PACKAGE_NAME,
       version=PACKAGE_VERSION,

testing/mozbase/mozdevice/sut_tests/test_unzip.py

@@ -1,60 +0,0 @@
-# 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 os
-import posixpath
-
-from dmunit import DeviceManagerTestCase
-
-
-class UnzipTestCase(DeviceManagerTestCase):
-
-    def runTest(self):
-        """ This tests unzipping a file on the device.
-        """
-        testroot = posixpath.join(self.dm.getDeviceRoot(), 'infratest')
-        self.dm.removeDir(testroot)
-        self.dm.mkDir(testroot)
-        self.assert_(self.dm.pushFile(
-            os.path.join('test-files', 'mybinary.zip'),
-            posixpath.join(testroot, 'mybinary.zip')))
-        self.assertNotEqual(self.dm.unpackFile(
-            posixpath.join(testroot, 'mybinary.zip')), None)
-        # the mybinary.zip file has the zipped up contents of test-files/push2
-        # so we validate it the same as test_push2.
-        self.assert_(self.dm.dirExists(
-            posixpath.join(testroot, 'push2', 'sub1')))
-        self.assert_(self.dm.validateFile(
-            posixpath.join(testroot, 'push2', 'sub1', 'file1.txt'),
-            os.path.join('test-files', 'push2', 'sub1', 'file1.txt')))
-        self.assert_(self.dm.validateFile(
-            posixpath.join(testroot, 'push2', 'sub1', 'sub1.1', 'file2.txt'),
-            os.path.join('test-files', 'push2', 'sub1', 'sub1.1', 'file2.txt')))
-        self.assert_(self.dm.validateFile(
-            posixpath.join(testroot, 'push2', 'sub2', 'file3.txt'),
-            os.path.join('test-files', 'push2', 'sub2', 'file3.txt')))
-        self.assert_(self.dm.validateFile(
-            posixpath.join(testroot, 'push2', 'file4.bin'),
-            os.path.join('test-files', 'push2', 'file4.bin')))
-
-        # test dest_dir param
-        newdir = posixpath.join(testroot, 'newDir')
-        self.dm.mkDir(newdir)
-
-        self.assertNotEqual(self.dm.unpackFile(
-            posixpath.join(testroot, 'mybinary.zip'), newdir), None)
-
-        self.assert_(self.dm.dirExists(posixpath.join(newdir, 'push2', 'sub1')))
-        self.assert_(self.dm.validateFile(
-            posixpath.join(newdir, 'push2', 'sub1', 'file1.txt'),
-            os.path.join('test-files', 'push2', 'sub1', 'file1.txt')))
-        self.assert_(self.dm.validateFile(
-            posixpath.join(newdir, 'push2', 'sub1', 'sub1.1', 'file2.txt'),
-            os.path.join('test-files', 'push2', 'sub1', 'sub1.1', 'file2.txt')))
-        self.assert_(self.dm.validateFile(
-            posixpath.join(newdir, 'push2', 'sub2', 'file3.txt'),
-            os.path.join('test-files', 'push2', 'sub2', 'file3.txt')))
-        self.assert_(self.dm.validateFile(
-            posixpath.join(newdir, 'push2', 'file4.bin'),
-            os.path.join('test-files', 'push2', 'file4.bin')))