diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2012-07-24 14:16:31 +0200 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2012-08-08 13:02:29 +0200 |
| commit | b7624f107db69c364a9827c895c909aaa0c6db44 (patch) | |
| tree | d01902bb26c34747121770d12e1f0dd57b085d84 /test | |
| parent | 089509e8cc818065da7d0278e9d213e9876c8b2c (diff) | |
test: fix tests
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_build_common.py | 4 | ||||
| -rw-r--r-- | test/test_cerbero_build_recipe.py | 2 | ||||
| -rw-r--r-- | test/test_cerbero_packages_packagemaker.py | 2 | ||||
| -rw-r--r-- | test/test_packages_common.py | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/test/test_build_common.py b/test/test_build_common.py index 7a0e08a6..2ba8a1cd 100644 --- a/test/test_build_common.py +++ b/test/test_build_common.py @@ -133,5 +133,7 @@ def create_cookbook(config): cb = CookBook(config, False) for klass in [Recipe1, Recipe2, Recipe3, Recipe4, Recipe5]: - cb.add_recipe(klass(config)) + r = klass(config) + r.__file__ = 'test/test_build_common.py' + cb.add_recipe(r) return cb diff --git a/test/test_cerbero_build_recipe.py b/test/test_cerbero_build_recipe.py index e8fed2c4..78d31bb1 100644 --- a/test/test_cerbero_build_recipe.py +++ b/test/test_cerbero_build_recipe.py @@ -66,7 +66,7 @@ class Class3(object): __metaclass__ = recipe.MetaUniversalRecipe - def do_step(self, name): + def _do_step(self, name): return name diff --git a/test/test_cerbero_packages_packagemaker.py b/test/test_cerbero_packages_packagemaker.py index 4733479b..8e755bea 100644 --- a/test/test_cerbero_packages_packagemaker.py +++ b/test/test_cerbero_packages_packagemaker.py @@ -48,7 +48,7 @@ class PackageMakerTest(unittest.TestCase): self.files = p.files_list() packager = OSXPackage(self.config, p, self.store) files = OSXPackage.files_list(packager, PackageType.RUNTIME, False) - tmpdest = packager._create_bundle(files, PackageType.RUNTIME) + tmpdest = packager._create_bundle(files, PackageType.RUNTIME)[0] bundlefiles = shell.check_call('find . -type f ', tmpdest).split('\n') bundlefiles = sorted([f[2:] for f in bundlefiles])[1:] self.assertEquals(bundlefiles, self.files) diff --git a/test/test_packages_common.py b/test/test_packages_common.py index adc9d385..ff0e71c5 100644 --- a/test/test_packages_common.py +++ b/test/test_packages_common.py @@ -123,8 +123,10 @@ def create_store(config): for klass in [Package1, Package2, Package3, Package4, App]: package = klass(config, store, cookbook) + package.__file__ = 'test/test_packages_common.py' store.add_package(package) for klass in [MetaPackage]: package = klass(config, store) + package.__file__ = 'test/test_packages_common.py' store.add_package(package) return store |