21 files changed, 23 insertions, 19 deletions
diff --git a/cerbero/tests/__init__.py b/test/__init__.py
index f58e249c..f58e249c 100644
--- a/cerbero/tests/__init__.py
+++ b/test/__init__.py
diff --git a/cerbero/tests/pkgconfig/glib-2.0.pc b/test/pkgconfig/glib-2.0.pc
index a99ab6b9..a99ab6b9 100644
--- a/cerbero/tests/pkgconfig/glib-2.0.pc
+++ b/test/pkgconfig/glib-2.0.pc
diff --git a/cerbero/tests/pkgconfig/gmodule-2.0.pc b/test/pkgconfig/gmodule-2.0.pc
index 08648ac1..08648ac1 100644
--- a/cerbero/tests/pkgconfig/gmodule-2.0.pc
+++ b/test/pkgconfig/gmodule-2.0.pc
diff --git a/cerbero/tests/pkgconfig/gmodule-no-export-2.0.pc b/test/pkgconfig/gmodule-no-export-2.0.pc
index fef7a39b..fef7a39b 100644
--- a/cerbero/tests/pkgconfig/gmodule-no-export-2.0.pc
+++ b/test/pkgconfig/gmodule-no-export-2.0.pc
diff --git a/cerbero/tests/pkgconfig/gobject-2.0.pc b/test/pkgconfig/gobject-2.0.pc
index 47981d93..47981d93 100644
--- a/cerbero/tests/pkgconfig/gobject-2.0.pc
+++ b/test/pkgconfig/gobject-2.0.pc
diff --git a/cerbero/tests/pkgconfig/gstreamer-0.10.pc b/test/pkgconfig/gstreamer-0.10.pc
index c4da2204..c4da2204 100644
--- a/cerbero/tests/pkgconfig/gstreamer-0.10.pc
+++ b/test/pkgconfig/gstreamer-0.10.pc
diff --git a/cerbero/tests/pkgconfig/gthread-2.0.pc b/test/pkgconfig/gthread-2.0.pc
index 4acc9a7c..4acc9a7c 100644
--- a/cerbero/tests/pkgconfig/gthread-2.0.pc
+++ b/test/pkgconfig/gthread-2.0.pc
diff --git a/cerbero/tests/pkgconfig/libxml-2.0.pc b/test/pkgconfig/libxml-2.0.pc
index 8588686f..8588686f 100644
--- a/cerbero/tests/pkgconfig/libxml-2.0.pc
+++ b/test/pkgconfig/libxml-2.0.pc
diff --git a/cerbero/tests/test_build_common.py b/test/test_build_common.py
index e2cfa608..e2cfa608 100644
--- a/cerbero/tests/test_build_common.py
+++ b/test/test_build_common.py
diff --git a/cerbero/tests/test_cerbero_build_filesprovider.py b/test/test_cerbero_build_filesprovider.py
index cf68260a..2c908939 100644
--- a/cerbero/tests/test_cerbero_build_filesprovider.py
+++ b/test/test_cerbero_build_filesprovider.py
@@ -22,8 +22,8 @@ import tempfile
 
 from cerbero.build import filesprovider
 from cerbero.config import Platform
-from cerbero.tests.test_build_common import add_files
-from cerbero.tests.test_common import DummyConfig
+from test.test_build_common import add_files
+from test.test_common import DummyConfig
 
 
 class Config(DummyConfig):
diff --git a/cerbero/tests/test_cerbero_build_recipe.py b/test/test_cerbero_build_recipe.py
index 5f6b9e83..73c518d7 100644
--- a/cerbero/tests/test_cerbero_build_recipe.py
+++ b/test/test_cerbero_build_recipe.py
@@ -21,7 +21,7 @@ import os
 
 from cerbero.build import recipe
 from cerbero.config import Platform
-from cerbero.tests.test_common import DummyConfig
+from test.test_common import DummyConfig
 
 
 class Class1(object):
diff --git a/cerbero/tests/test_cerbero_ide_pkgconfig.py b/test/test_cerbero_ide_pkgconfig.py
index 4827efd7..4827efd7 100644
--- a/cerbero/tests/test_cerbero_ide_pkgconfig.py
+++ b/test/test_cerbero_ide_pkgconfig.py
diff --git a/cerbero/tests/test_cerbero_ide_xcode_xcconfig.py b/test/test_cerbero_ide_xcode_xcconfig.py
index 87c76d94..87c76d94 100644
--- a/cerbero/tests/test_cerbero_ide_xcode_xcconfig.py
+++ b/test/test_cerbero_ide_xcode_xcconfig.py
diff --git a/cerbero/tests/test_cerbero_packages_disttarball.py b/test/test_cerbero_packages_disttarball.py
index bdf40c70..b7427a2d 100644
--- a/cerbero/tests/test_cerbero_packages_disttarball.py
+++ b/test/test_cerbero_packages_disttarball.py
@@ -22,9 +22,9 @@ import tarfile
 import tempfile
 
 from cerbero.packages.disttarball import DistTarball
-from cerbero.tests.test_packages_common import create_store
-from cerbero.tests.test_common import DummyConfig
-from cerbero.tests.test_build_common import add_files
+from test.test_packages_common import create_store
+from test.test_common import DummyConfig
+from test.test_build_common import add_files
 
 
 class DistTarballTest(unittest.TestCase):
diff --git a/cerbero/tests/test_cerbero_packages_package.py b/test/test_cerbero_packages_package.py
index 1e5f919c..78353330 100644
--- a/cerbero/tests/test_cerbero_packages_package.py
+++ b/test/test_cerbero_packages_package.py
@@ -21,10 +21,10 @@ import unittest
 import tempfile
 
 from cerbero.config import Platform, Distro, DistroVersion
-from cerbero.tests.test_packages_common import Package1, Package4, MetaPackage
-from cerbero.tests.test_build_common import create_cookbook, add_files
-from cerbero.tests.test_packages_common import create_store
-from cerbero.tests.test_common import DummyConfig
+from test.test_packages_common import Package1, Package4, MetaPackage
+from test.test_build_common import create_cookbook, add_files
+from test.test_packages_common import create_store
+from test.test_common import DummyConfig
 
 
 class Config(DummyConfig):
diff --git a/cerbero/tests/test_cerbero_packages_packagemaker.py b/test/test_cerbero_packages_packagemaker.py
index a958ac51..3266f515 100644
--- a/cerbero/tests/test_cerbero_packages_packagemaker.py
+++ b/test/test_cerbero_packages_packagemaker.py
@@ -25,8 +25,8 @@ from cerbero.config import Platform
 from cerbero.packages import PackageType
 from cerbero.packages.packagemaker import OSXPackage, PackageMaker
 from cerbero.utils import shell
-from cerbero.tests.test_packages_common import create_store
-from cerbero.tests.test_common import DummyConfig
+from test.test_packages_common import create_store
+from test.test_common import DummyConfig
 
 
 class PackageMakerTest(unittest.TestCase):
diff --git a/cerbero/tests/test_cerbero_packages_packagesstore.py b/test/test_cerbero_packages_packagesstore.py
index 164aac40..accd99ee 100644
--- a/cerbero/tests/test_cerbero_packages_packagesstore.py
+++ b/test/test_cerbero_packages_packagesstore.py
@@ -23,7 +23,7 @@ from cerbero.config import Platform
 from cerbero.errors import PackageNotFoundError
 from cerbero.packages.package import Package, MetaPackage
 from cerbero.packages.packagesstore import PackagesStore
-from cerbero.tests import test_packages_common as common
+from test import test_packages_common as common
 
 
 PACKAGE = '''
diff --git a/cerbero/tests/test_cerbero_packages_pmdoc.py b/test/test_cerbero_packages_pmdoc.py
index a9f14ffe..2bebdc82 100644
--- a/cerbero/tests/test_cerbero_packages_pmdoc.py
+++ b/test/test_cerbero_packages_pmdoc.py
@@ -20,13 +20,14 @@ import os
 import unittest
 import tempfile
 import shutil
+import sys
 
 from cerbero.config import Platform
 from cerbero.packages import PackageType
 from cerbero.packages.pmdoc import Index, PkgRef, PkgContents, PMDoc
 from cerbero.utils import shell
-from cerbero.tests.test_packages_common import create_store, Package1
-from cerbero.tests.test_common import XMLMixin, DummyConfig
+from test.test_packages_common import create_store, Package1
+from test.test_common import XMLMixin, DummyConfig
 
 
 class IndexTest(unittest.TestCase, XMLMixin):
@@ -232,9 +233,10 @@ class PkgContentsTest(unittest.TestCase, XMLMixin):
             else:
                 self.assertEquals(c.attrib['n'], 'README')
 
-
 class TestPMDoc(unittest.TestCase):
 
+    #if not sys.platform.startswith('darwin'):
+
     def setUp(self):
         self.config = DummyConfig()
         self.store = create_store(self.config)
@@ -247,6 +249,7 @@ class TestPMDoc(unittest.TestCase):
     def tearDown(self):
         shutil.rmtree(self.tmp)
 
+    @unittest.skipUnless(sys.platform.startswith("darwin"), "requires OSX")
     def testAllFilesCreated(self):
         d = dict()
         packages = ['gstreamer-test1', 'gstreamer-test3',
diff --git a/cerbero/tests/test_cerbero_packages_wix.py b/test/test_cerbero_packages_wix.py
index 11d39f8e..2bcd3323 100644
--- a/cerbero/tests/test_cerbero_packages_wix.py
+++ b/test/test_cerbero_packages_wix.py
@@ -23,8 +23,8 @@ from cerbero.config import Platform
 from cerbero.packages import package
 from cerbero.packages.wix import MergeModule
 from cerbero.utils import etree
-from cerbero.tests.test_build_common import create_cookbook
-from cerbero.tests.test_common import DummyConfig
+from test.test_build_common import create_cookbook
+from test.test_common import DummyConfig
 
 
 class Recipe1(recipe.Recipe):
diff --git a/cerbero/tests/test_common.py b/test/test_common.py
index 7540a833..2932be06 100644
--- a/cerbero/tests/test_common.py
+++ b/test/test_common.py
@@ -32,6 +32,7 @@ class DummyConfig(object):
     num_of_cpus = 1
     target_version = None
     target_distro_version = None
+    packages_prefix = ''
 
 
 class XMLMixin():
diff --git a/cerbero/tests/test_packages_common.py b/test/test_packages_common.py
index 9510046f..4b338c98 100644
--- a/cerbero/tests/test_packages_common.py
+++ b/test/test_packages_common.py
@@ -19,7 +19,7 @@
 from cerbero.config import Platform, Distro, DistroVersion
 from cerbero.packages import package
 from cerbero.packages.packagesstore import PackagesStore
-from cerbero.tests.test_build_common import create_cookbook
+from test.test_build_common import create_cookbook
 
 
 class Package1(package.Package):