diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2012-05-21 17:24:18 +0200 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2012-05-21 17:25:03 +0200 |
| commit | 76722bd266995e0f686c73601f3bf07629f64907 (patch) | |
| tree | 2f52a1f6d9d1d14c6423d3a72ce021b77ac0daa5 | |
| parent | 82ef1c121a3c7084ac57076997411e4bd2098133 (diff) | |
test: fix tests
| -rw-r--r-- | cerbero/packages/packagemaker.py | 2 | ||||
| -rw-r--r-- | test/test_cerbero_config.py | 1 | ||||
| -rw-r--r-- | test/test_cerbero_packages_packagemaker.py | 2 | ||||
| -rw-r--r-- | test/test_cerbero_packages_pmdoc.py | 7 |
4 files changed, 8 insertions, 4 deletions
diff --git a/cerbero/packages/packagemaker.py b/cerbero/packages/packagemaker.py index d456a3d3..b2352499 100644 --- a/cerbero/packages/packagemaker.py +++ b/cerbero/packages/packagemaker.py @@ -208,7 +208,7 @@ class PackageMaker(object): CMD = './PackageMaker' def create_package(self, root, pkg_id, version, title, output_file, - destination='/opt/', target='0.15'): + destination='/opt/', target='10.5'): ''' Creates an osx package, where all files are properly bundled in a directory that is set as the package root diff --git a/test/test_cerbero_config.py b/test/test_cerbero_config.py index adcc99c5..6f0fdb1a 100644 --- a/test/test_cerbero_config.py +++ b/test/test_cerbero_config.py @@ -67,6 +67,7 @@ class LinuxPackagesTest(unittest.TestCase): 'prefix': None, 'sources': None, 'local_sources': None, + 'min_osx_sdk_version': None, 'lib_suffix': '', 'cache_file': None, 'toolchain_prefix': None, diff --git a/test/test_cerbero_packages_packagemaker.py b/test/test_cerbero_packages_packagemaker.py index 3266f515..b4bacf28 100644 --- a/test/test_cerbero_packages_packagemaker.py +++ b/test/test_cerbero_packages_packagemaker.py @@ -94,5 +94,5 @@ class TestPackageMaker(unittest.TestCase): pm.create_package('root', 'pkg_id', 'version', 'title', 'output_file', 'destination') self.assertEquals(pm.cmd, - "./PackageMaker -i 'pkg_id' -l 'destination' -o 'output_file' " + "./PackageMaker -g '10.5' -i 'pkg_id' -l 'destination' -o 'output_file' " "-n 'version' -r 'root' -t 'title'") diff --git a/test/test_cerbero_packages_pmdoc.py b/test/test_cerbero_packages_pmdoc.py index d253c0c8..607bc116 100644 --- a/test/test_cerbero_packages_pmdoc.py +++ b/test/test_cerbero_packages_pmdoc.py @@ -165,7 +165,8 @@ class PkgRefTest(unittest.TestCase, XMLMixin): self.check_text(config, PkgRef.TAG_INSTALL_TO, '.') self.find_one(config, PkgRef.TAG_REQ_AUTH) mods = ['installTo.isAbsoluteType', 'installTo.path', - 'parent', 'installTo.isRelativeType', 'installTo'] + 'parent', 'installTo.isRelativeType', 'installTo', + 'version', 'identifier'] docmods = [x.text for x in config.iterfind(PkgRef.TAG_MOD)] self.assertEquals(sorted(mods), sorted(docmods)) flags = self.find_one(config, PkgRef.TAG_FLAGS) @@ -255,7 +256,9 @@ class TestPMDoc(unittest.TestCase): packages = ['gstreamer-test1', 'gstreamer-test3', 'gstreamer-test-bindings', 'gstreamer-test2'] for name in packages: - d[name] =self.packages_path + p =self.store.get_package(name) + d[p] = self.packages_path + self.package.__file__ = '' pmdoc = PMDoc(self.package, self.store, self.tmp, d) path = pmdoc.create() files = os.listdir(path) |