format: apply new format style

Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1315>

19 files changed, 385 insertions, 483 deletions

diff --git a/test/test_build_common.py b/test/test_build_common.py
index 2ba8a1cd..225578c7 100644
--- a/test/test_build_common.py
+++ b/test/test_build_common.py
@@ -25,29 +25,21 @@ from cerbero.utils import shell
 
 
 class Recipe1(recipe.Recipe):
-
     name = 'recipe1'
     licence = 'LGPL'
     uuid = '1'
 
     files_misc = ['README', 'libexec/gstreamer-0.10/pluginsloader%(bext)s']
-    platform_files_misc = {
-        Platform.WINDOWS: ['windows'],
-        Platform.LINUX: ['linux']}
+    platform_files_misc = {Platform.WINDOWS: ['windows'], Platform.LINUX: ['linux']}
 
     files_bins = ['gst-launch']
-    platform_files_bins = {
-        Platform.WINDOWS: ['windows'],
-        Platform.LINUX: ['linux']}
+    platform_files_bins = {Platform.WINDOWS: ['windows'], Platform.LINUX: ['linux']}
 
     files_libs = ['libgstreamer-0.10']
-    platform_files_libs = {
-        Platform.WINDOWS: ['libgstreamer-win32'],
-        Platform.LINUX: ['libgstreamer-x11']}
+    platform_files_libs = {Platform.WINDOWS: ['libgstreamer-win32'], Platform.LINUX: ['libgstreamer-x11']}
 
 
 class Recipe2(recipe.Recipe):
-
     name = 'recipe2'
     licence = 'GPL'
 
@@ -55,7 +47,6 @@ class Recipe2(recipe.Recipe):
 
 
 class Recipe3(recipe.Recipe):
-
     name = 'recipe3'
     licences = 'BSD'
 
@@ -63,7 +54,6 @@ class Recipe3(recipe.Recipe):
 
 
 class Recipe4(recipe.Recipe):
-
     name = 'recipe4'
     licence = 'LGPL'
 
@@ -71,7 +61,6 @@ class Recipe4(recipe.Recipe):
 
 
 class Recipe5(recipe.Recipe):
-
     name = 'recipe5'
     licence = 'LGPL'
 
@@ -85,7 +74,8 @@ def add_files(tmp):
     os.makedirs(bindir)
     os.makedirs(libdir)
     os.makedirs(gstlibdir)
-    shell.call('touch '
+    shell.call(
+        'touch '
         'windows '
         'linux '
         'README '
@@ -126,7 +116,8 @@ def add_files(tmp):
         'lib/libgstreamer-x11.la '
         'libexec/gstreamer-0.10/pluginsloader '
         'libexec/gstreamer-0.10/pluginsloader.exe ',
-        tmp)
+        tmp,
+    )
 
 
 def create_cookbook(config):
diff --git a/test/test_cerbero_build_build.py b/test/test_cerbero_build_build.py
index 941addf0..02c917d6 100644
--- a/test/test_cerbero_build_build.py
+++ b/test/test_cerbero_build_build.py
@@ -24,7 +24,6 @@ from cerbero.build import build
 
 
 class MakefilesBase(build.MakefilesBase):
-
     srcdir = ''
     build_dir = ''
 
@@ -44,7 +43,6 @@ class MakefilesBase(build.MakefilesBase):
 
 
 class ModifyEnvTest(unittest.TestCase):
-
     def setUp(self):
         self.var = 'TEST_VAR'
         self.val1 = 'test'
@@ -55,7 +53,7 @@ class ModifyEnvTest(unittest.TestCase):
         os.environ[self.var] = self.val1
         self.mk.append_env = {self.var: self.val2}
         val = self.mk.get_env_var(self.var)
-        self.assertEqual(val, "%s %s" % (self.val1, self.val2))
+        self.assertEqual(val, '%s %s' % (self.val1, self.val2))
 
     def testAppendNonExistentEnv(self):
         if self.var in os.environ:
@@ -83,15 +81,14 @@ class ModifyEnvTest(unittest.TestCase):
         self.mk.config.allow_system_libs = True
         self.mk.use_system_libs = True
         val = self.mk.get_env_var('PKG_CONFIG_PATH')
-        self.assertEqual(val,'/path/2:/usr/lib/pkgconfig:'
-            '/usr/share/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig')
+        self.assertEqual(val, '/path/2:/usr/lib/pkgconfig:' '/usr/share/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig')
         val = self.mk.get_env_var('PKG_CONFIG_LIBDIR')
-        self.assertEqual(val,'/path/2')
+        self.assertEqual(val, '/path/2')
 
     def testNestedModif(self):
         os.environ[self.var] = self.val1
         self.mk.append_env = {self.var: self.val2}
         val = self.mk.get_env_var(self.var)
-        self.assertEqual(val, "%s %s" % (self.val1, self.val2))
+        self.assertEqual(val, '%s %s' % (self.val1, self.val2))
         val = self.mk.get_env_var_nested(self.var)
-        self.assertEqual(val, "%s %s" % (self.val1, self.val2))
+        self.assertEqual(val, '%s %s' % (self.val1, self.val2))
diff --git a/test/test_cerbero_build_cookbook.py b/test/test_cerbero_build_cookbook.py
index 6fe6d601..d4f18230 100644
--- a/test/test_cerbero_build_cookbook.py
+++ b/test/test_cerbero_build_cookbook.py
@@ -27,7 +27,6 @@ from test.test_build_common import Recipe1
 
 
 class PackageTest(unittest.TestCase):
-
     def setUp(self):
         self.config = Config()
         self.config.cache_file = '/dev/null'
@@ -65,8 +64,7 @@ class PackageTest(unittest.TestCase):
 
     def testAddGetRecipe(self):
         recipe = Recipe1(self.config)
-        self.assertRaises(RecipeNotFoundError, self.cookbook.get_recipe,
-                              recipe.name)
+        self.assertRaises(RecipeNotFoundError, self.cookbook.get_recipe, recipe.name)
         self.cookbook.add_recipe(recipe)
         self.assertEqual(recipe, self.cookbook.recipes[recipe.name])
         self.assertEqual(recipe, self.cookbook.get_recipe(recipe.name))
diff --git a/test/test_cerbero_build_filesprovider.py b/test/test_cerbero_build_filesprovider.py
index fdd36d5a..e7261927 100644
--- a/test/test_cerbero_build_filesprovider.py
+++ b/test/test_cerbero_build_filesprovider.py
@@ -27,29 +27,22 @@ from test.test_common import DummyConfig
 
 
 class Config(DummyConfig):
-
     def __init__(self, tmp, platform):
         self.prefix = tmp
         self.target_platform = platform
 
 
 class FilesProvider(filesprovider.FilesProvider):
-
     files_misc = ['README', 'libexec/gstreamer-0.10/pluginsloader%(bext)s']
     files_libs = ['libgstreamer-0.10']
     files_bins = ['gst-launch']
     files_devel = ['include/gstreamer.h']
     licenses_devel = [License.LGPL]
-    platform_files_bins = {
-            Platform.WINDOWS: ['windows'],
-            Platform.LINUX: ['linux']}
-    platform_files_libs = {
-            Platform.WINDOWS: ['libgstreamer-win32'],
-            Platform.LINUX: ['libgstreamer-x11']}
+    platform_files_bins = {Platform.WINDOWS: ['windows'], Platform.LINUX: ['linux']}
+    platform_files_libs = {Platform.WINDOWS: ['libgstreamer-win32'], Platform.LINUX: ['libgstreamer-x11']}
 
 
 class PackageTest(unittest.TestCase):
-
     def setUp(self):
         self.tmp = tempfile.mkdtemp()
         win32config = Config(self.tmp, Platform.WINDOWS)
@@ -63,44 +56,44 @@ class PackageTest(unittest.TestCase):
         self.linuxlib = ['lib/libgstreamer-0.10.so.1', 'lib/libgstreamer-x11.so.1']
         self.winmisc = ['README', 'libexec/gstreamer-0.10/pluginsloader.exe']
         self.linuxmisc = ['README', 'libexec/gstreamer-0.10/pluginsloader']
-        devfiles = ['include/gstreamer.h', 'lib/libgstreamer-0.10.a',
-                    'lib/libgstreamer-0.10.la']
-
-        self.windevfiles = devfiles + ['lib/libgstreamer-win32.a',
-                'lib/libgstreamer-win32.la', 'lib/libgstreamer-win32.dll.a',
-                'lib/libgstreamer-win32.def', 'lib/gstreamer-win32.lib',
-                'lib/libgstreamer-0.10.dll.a', 'lib/libgstreamer-0.10.def',
-                'lib/gstreamer-0.10.lib']
-        self.lindevfiles = devfiles + ['lib/libgstreamer-0.10.so',
-                'lib/libgstreamer-x11.a', 'lib/libgstreamer-x11.la',
-                'lib/libgstreamer-x11.so']
+        devfiles = ['include/gstreamer.h', 'lib/libgstreamer-0.10.a', 'lib/libgstreamer-0.10.la']
+
+        self.windevfiles = devfiles + [
+            'lib/libgstreamer-win32.a',
+            'lib/libgstreamer-win32.la',
+            'lib/libgstreamer-win32.dll.a',
+            'lib/libgstreamer-win32.def',
+            'lib/gstreamer-win32.lib',
+            'lib/libgstreamer-0.10.dll.a',
+            'lib/libgstreamer-0.10.def',
+            'lib/gstreamer-0.10.lib',
+        ]
+        self.lindevfiles = devfiles + [
+            'lib/libgstreamer-0.10.so',
+            'lib/libgstreamer-x11.a',
+            'lib/libgstreamer-x11.la',
+            'lib/libgstreamer-x11.so',
+        ]
 
     def tearDown(self):
         shutil.rmtree(self.tmp)
 
     def testFilesCategories(self):
-        self.assertEqual(sorted(['bins', 'libs', 'misc', 'devel']),
-                self.win32recipe._files_categories())
+        self.assertEqual(sorted(['bins', 'libs', 'misc', 'devel']), self.win32recipe._files_categories())
 
     def testListBinaries(self):
-        self.assertEqual(self.win32recipe.files_list_by_category('bins'),
-                sorted(self.winbin))
-        self.assertEqual(self.linuxrecipe.files_list_by_category('bins'),
-                sorted(self.linuxbin))
+        self.assertEqual(self.win32recipe.files_list_by_category('bins'), sorted(self.winbin))
+        self.assertEqual(self.linuxrecipe.files_list_by_category('bins'), sorted(self.linuxbin))
 
     def testListLibraries(self):
         add_files(self.tmp)
-        self.assertEqual(self.win32recipe.files_list_by_category('libs'),
-                sorted(self.winlib))
-        self.assertEqual(self.linuxrecipe.files_list_by_category('libs'),
-                sorted(self.linuxlib))
+        self.assertEqual(self.win32recipe.files_list_by_category('libs'), sorted(self.winlib))
+        self.assertEqual(self.linuxrecipe.files_list_by_category('libs'), sorted(self.linuxlib))
 
     def testDevelFiles(self):
         add_files(self.tmp)
-        self.assertEqual(self.win32recipe.devel_files_list(),
-                sorted(self.windevfiles))
-        self.assertEqual(self.linuxrecipe.devel_files_list(),
-                sorted(self.lindevfiles))
+        self.assertEqual(self.win32recipe.devel_files_list(), sorted(self.windevfiles))
+        self.assertEqual(self.linuxrecipe.devel_files_list(), sorted(self.lindevfiles))
 
     def testDistFiles(self):
         win32files = self.winlib + self.winbin + self.winmisc
diff --git a/test/test_cerbero_build_recipe.py b/test/test_cerbero_build_recipe.py
index 2b2a643c..03194d59 100644
--- a/test/test_cerbero_build_recipe.py
+++ b/test/test_cerbero_build_recipe.py
@@ -27,7 +27,6 @@ from test.test_build_common import Recipe1
 
 
 class Class1(object):
-
     test = None
 
     def __init__(self):
@@ -38,13 +37,11 @@ class Class1(object):
 
 
 class Class2(object):
-
     class2_method = lambda x: None
     fetch = lambda x: 'CODEPASS'
 
 
 class Recipe(recipe.Recipe):
-
     btype = Class1
     stype = Class2
 
@@ -63,13 +60,11 @@ class Recipe(recipe.Recipe):
 
 
 class Class3(object, metaclass=recipe.MetaUniversalRecipe):
-
     def _do_step(self, name):
         return name
 
 
 class TestReceiptMetaClass(unittest.TestCase):
-
     def setUp(self):
         self.config = DummyConfig()
         self.config.local_sources = ''
@@ -99,7 +94,6 @@ class TestReceiptMetaClass(unittest.TestCase):
 
 
 class TestReceipt(unittest.TestCase):
-
     def setUp(self):
         self.config = DummyConfig()
         self.config.local_sources = 'path1'
@@ -131,7 +125,6 @@ class TestReceipt(unittest.TestCase):
 
 
 class TestLicenses(unittest.TestCase):
-
     def setUp(self):
         self.config = DummyConfig()
         self.config.local_sources = ''
@@ -156,7 +149,6 @@ class TestLicenses(unittest.TestCase):
 
 
 class TestMetaUniveralRecipe(unittest.TestCase):
-
     def testBuildSteps(self):
         obj = Class3()
         for _, step in recipe.BuildSteps():
@@ -166,7 +158,6 @@ class TestMetaUniveralRecipe(unittest.TestCase):
 
 
 class TestUniversalRecipe(unittest.TestCase):
-
     def setUp(self):
         self.config = DummyConfig()
         self.config.target_platform = Platform.LINUX
@@ -194,10 +185,8 @@ class TestUniversalRecipe(unittest.TestCase):
 
     def testAddRecipe(self):
         self.recipe.add_recipe(self.recipe_x86)
-        self.assertEqual(self.recipe._recipes[Architecture.X86],
-                          self.recipe_x86)
-        self.assertEqual(self.recipe._proxy_recipe,
-                          self.recipe_x86)
+        self.assertEqual(self.recipe._recipes[Architecture.X86], self.recipe_x86)
+        self.assertEqual(self.recipe._proxy_recipe, self.recipe_x86)
 
     def testDifferentRecipe(self):
         self.recipe.add_recipe(self.recipe_x86)
@@ -209,5 +198,4 @@ class TestUniversalRecipe(unittest.TestCase):
         self.assertEqual(self.recipe.steps, [])
         self.recipe.add_recipe(self.recipe_x86)
         self.recipe.add_recipe(self.recipe_x86_64)
-        self.assertEqual(self.recipe.steps,
-                recipe.BuildSteps() + [recipe.BuildSteps.MERGE])
+        self.assertEqual(self.recipe.steps, recipe.BuildSteps() + [recipe.BuildSteps.MERGE])
diff --git a/test/test_cerbero_config.py b/test/test_cerbero_config.py
index f4465f83..ec43b363 100644
--- a/test/test_cerbero_config.py
+++ b/test/test_cerbero_config.py
@@ -25,13 +25,13 @@ from cerbero import config as cconfig
 from cerbero.enums import Platform
 from cerbero.errors import FatalError, ConfigurationError
 from cerbero.utils import system_info
+
 Config = cconfig.Config
 
 
 class LinuxPackagesTest(unittest.TestCase):
-
     def setUp(self):
-        os.environ[cconfig.CERBERO_UNINSTALLED]='1'
+        os.environ[cconfig.CERBERO_UNINSTALLED] = '1'
 
     def _checkLoadConfig(self, config, func, filename, properties):
         with open(filename, 'w+') as f:
@@ -53,45 +53,44 @@ class LinuxPackagesTest(unittest.TestCase):
         data_dir = os.path.join(os.path.dirname(__file__), '..', 'data')
         data_dir = os.path.abspath(data_dir)
         props = {
-                 'platform': platform,
-                 'target_platform': platform,
-                 'distro': distro,
-                 'distro_version': distro_version,
-                 'target_distro': distro,
-                 'target_distro_version': distro_version,
-                 'arch': arch,
-                 'target_arch': arch,
-                 'num_of_cpus': num_of_cpus,
-                 'host': None,
-                 'build': None,
-                 'target': None,
-                 'prefix': None,
-                 'sources': None,
-                 'local_sources': None,
-                 'min_osx_sdk_version': None,
-                 'lib_suffix': '',
-                 'cache_file': None,
-                 'toolchain_prefix': None,
-                 'install_dir': None,
-                 'packages_prefix': None,
-                 'data_dir': data_dir,
-                 'environ_dir': config._relative_path('config'),
-                 'recipes_dir': config._relative_path('recipes'),
-                 'packages_dir': config._relative_path('packages'),
-                 'git_root': cconfig.DEFAULT_GIT_ROOT,
-                 'wix_prefix': cconfig.DEFAULT_WIX_PREFIX,
-                 'packager': cconfig.DEFAULT_PACKAGER,
-                 'py_prefix': 'lib/python%s.%s' % (sys.version_info[0],
-                                                   sys.version_info[1]),
-                 'allow_parallel_build': cconfig.DEFAULT_ALLOW_PARALLEL_BUILD,
-                 'use_configure_cache': False,
-                 'allow_system_libs': True,
-                 'external_packages': {},
-                 'external_recipes': {},
-                 'use_ccache': None,
-                 'force_git_commit': None,
-                 'universal_archs': [cconfig.Architecture.X86, cconfig.Architecture.X86_64],
-                 }
+            'platform': platform,
+            'target_platform': platform,
+            'distro': distro,
+            'distro_version': distro_version,
+            'target_distro': distro,
+            'target_distro_version': distro_version,
+            'arch': arch,
+            'target_arch': arch,
+            'num_of_cpus': num_of_cpus,
+            'host': None,
+            'build': None,
+            'target': None,
+            'prefix': None,
+            'sources': None,
+            'local_sources': None,
+            'min_osx_sdk_version': None,
+            'lib_suffix': '',
+            'cache_file': None,
+            'toolchain_prefix': None,
+            'install_dir': None,
+            'packages_prefix': None,
+            'data_dir': data_dir,
+            'environ_dir': config._relative_path('config'),
+            'recipes_dir': config._relative_path('recipes'),
+            'packages_dir': config._relative_path('packages'),
+            'git_root': cconfig.DEFAULT_GIT_ROOT,
+            'wix_prefix': cconfig.DEFAULT_WIX_PREFIX,
+            'packager': cconfig.DEFAULT_PACKAGER,
+            'py_prefix': 'lib/python%s.%s' % (sys.version_info[0], sys.version_info[1]),
+            'allow_parallel_build': cconfig.DEFAULT_ALLOW_PARALLEL_BUILD,
+            'use_configure_cache': False,
+            'allow_system_libs': True,
+            'external_packages': {},
+            'external_recipes': {},
+            'use_ccache': None,
+            'force_git_commit': None,
+            'universal_archs': [cconfig.Architecture.X86, cconfig.Architecture.X86_64],
+        }
         self.assertEqual(sorted(config._properties), sorted(props.keys()))
         for p, v in props.items():
             self.assertEqual(getattr(config, p), v)
@@ -107,8 +106,7 @@ class LinuxPackagesTest(unittest.TestCase):
             self.assertIsNone(getattr(config, p))
 
         config.load_defaults()
-        self._checkLoadConfig(config, config._load_main_config,
-                              tmpconfig.name, config._properties)
+        self._checkLoadConfig(config, config._load_main_config, tmpconfig.name, config._properties)
 
     def testLoadPlatformConfig(self):
         config = Config()
@@ -116,11 +114,9 @@ class LinuxPackagesTest(unittest.TestCase):
         config.environ_dir = tmpdir
         config.load_defaults()
         config._load_platform_config()
-        platform_config = os.path.join(tmpdir, '%s.config' %
-                                       config.target_platform)
+        platform_config = os.path.join(tmpdir, '%s.config' % config.target_platform)
         config.load_defaults()
-        self._checkLoadConfig(config, config._load_platform_config,
-                              platform_config, config._properties)
+        self._checkLoadConfig(config, config._load_platform_config, platform_config, config._properties)
 
     def testFindDataDir(self):
         config = Config()
@@ -133,7 +129,7 @@ class LinuxPackagesTest(unittest.TestCase):
         del os.environ[cconfig.CERBERO_UNINSTALLED]
         config._check_uninstalled()
         self.assertFalse(config.uninstalled)
-        os.environ[cconfig.CERBERO_UNINSTALLED]='1'
+        os.environ[cconfig.CERBERO_UNINSTALLED] = '1'
         config._check_uninstalled()
         self.assertTrue(config.uninstalled)
 
@@ -143,8 +139,7 @@ class LinuxPackagesTest(unittest.TestCase):
         config.prefix = tmpdir
         config.load_defaults()
         config.do_setup_env()
-        env = config.get_env(tmpdir, os.path.join(tmpdir, 'lib'),
-                             config.py_prefix)
+        env = config.get_env(tmpdir, os.path.join(tmpdir, 'lib'), config.py_prefix)
         for k, v in env.items():
             self.assertEqual(os.environ[k], v)
 
@@ -167,8 +162,7 @@ class LinuxPackagesTest(unittest.TestCase):
         config.filename = None
         config._load_cmd_config(None)
         self.assertIsNone(config.filename)
-        self.assertRaises(ConfigurationError, config._load_cmd_config,
-                '/foo/bar')
+        self.assertRaises(ConfigurationError, config._load_cmd_config, '/foo/bar')
         tmpfile = tempfile.NamedTemporaryFile()
         config._load_cmd_config(tmpfile.name)
         self.assertEqual(config.filename, cconfig.DEFAULT_CONFIG_FILE)
@@ -179,27 +173,19 @@ class LinuxPackagesTest(unittest.TestCase):
         cerbero_home = os.path.expanduser('~/cerbero')
         self.assertEqual(config.prefix, os.path.join(cerbero_home, 'dist'))
         self.assertEqual(config.install_dir, config.prefix)
-        self.assertEqual(config.sources,
-            os.path.join(cerbero_home, 'sources'))
-        self.assertEqual(config.local_sources,
-            os.path.join(cerbero_home, 'sources', 'local'))
+        self.assertEqual(config.sources, os.path.join(cerbero_home, 'sources'))
+        self.assertEqual(config.local_sources, os.path.join(cerbero_home, 'sources', 'local'))
 
     def testRecipesExternalRepositories(self):
         config = Config()
         config.recipes_dir = 'test'
-        config.external_recipes = {'test1': ('/path/to/repo', 1),
-                                   'test2': ('/path/to/other/repo', 2)}
-        expected = {'default': ('test', 0),
-                    'test1': ('/path/to/repo', 1),
-                    'test2': ('/path/to/other/repo', 2)}
+        config.external_recipes = {'test1': ('/path/to/repo', 1), 'test2': ('/path/to/other/repo', 2)}
+        expected = {'default': ('test', 0), 'test1': ('/path/to/repo', 1), 'test2': ('/path/to/other/repo', 2)}
         self.assertEqual(config.get_recipes_repos(), expected)
 
     def testPakcagesExternalRepositories(self):
         config = Config()
         config.packages_dir = 'test'
-        config.external_packages = {'test1': ('/path/to/repo', 1),
-                                   'test2': ('/path/to/other/repo', 2)}
-        expected = {'default': ('test', 0),
-                    'test1': ('/path/to/repo', 1),
-                    'test2': ('/path/to/other/repo', 2)}
+        config.external_packages = {'test1': ('/path/to/repo', 1), 'test2': ('/path/to/other/repo', 2)}
+        expected = {'default': ('test', 0), 'test1': ('/path/to/repo', 1), 'test2': ('/path/to/other/repo', 2)}
         self.assertEqual(config.get_packages_repos(), expected)
diff --git a/test/test_cerbero_ide_pkgconfig.py b/test/test_cerbero_ide_pkgconfig.py
index 85d31f72..b484789a 100644
--- a/test/test_cerbero_ide_pkgconfig.py
+++ b/test/test_cerbero_ide_pkgconfig.py
@@ -24,7 +24,6 @@ from cerbero.ide.pkgconfig import PkgConfig
 
 
 class TestPkgConfig(unittest.TestCase):
-
     def setUp(self):
         pc_path = os.path.join(os.path.dirname(__file__), 'pkgconfig')
         os.environ['PKG_CONFIG_LIBDIR'] = pc_path
@@ -33,14 +32,24 @@ class TestPkgConfig(unittest.TestCase):
         self.pkgconfig2 = PkgConfig('gstreamer-0.10', False)
 
     def testListAll(self):
-        expected = ['gobject-2.0', 'gmodule-2.0', 'libxml-2.0', 'gthread-2.0',
-                'glib-2.0', 'gmodule-no-export-2.0', 'gstreamer-0.10']
+        expected = [
+            'gobject-2.0',
+            'gmodule-2.0',
+            'libxml-2.0',
+            'gthread-2.0',
+            'glib-2.0',
+            'gmodule-no-export-2.0',
+            'gstreamer-0.10',
+        ]
         self.assertEqual(sorted(PkgConfig.list_all()), sorted(expected))
 
     def testIncludeDirs(self):
-        expected = ['/usr/include/gstreamer-0.10', '/usr/include/glib-2.0',
-                    '/usr/lib/glib-2.0/include',
-                    '/usr/include/libxml2']
+        expected = [
+            '/usr/include/gstreamer-0.10',
+            '/usr/include/glib-2.0',
+            '/usr/lib/glib-2.0/include',
+            '/usr/include/libxml2',
+        ]
         self.assertEqual(self.pkgconfig.include_dirs(), expected)
         expected = ['/usr/include/gstreamer-0.10']
         self.assertEqual(self.pkgconfig2.include_dirs(), expected)
@@ -58,15 +67,13 @@ class TestPkgConfig(unittest.TestCase):
         self.assertEqual(self.pkgconfig2.libraries_dirs(), expected)
 
     def testLibraries(self):
-        expected = ['gstreamer-0.10', 'gobject-2.0', 'gmodule-2.0', 'xml2',
-                    'gthread-2.0', 'rt', 'glib-2.0']
+        expected = ['gstreamer-0.10', 'gobject-2.0', 'gmodule-2.0', 'xml2', 'gthread-2.0', 'rt', 'glib-2.0']
         self.assertEqual(self.pkgconfig.libraries(), expected)
         expected = ['gstreamer-0.10']
         self.assertEqual(self.pkgconfig2.libraries(), expected)
 
     def testRequires(self):
-        expected = ['glib-2.0', 'gobject-2.0', 'gmodule-no-export-2.0',
-                    'gthread-2.0', 'libxml-2.0']
+        expected = ['glib-2.0', 'gobject-2.0', 'gmodule-no-export-2.0', 'gthread-2.0', 'libxml-2.0']
         self.assertEqual(self.pkgconfig.requires(), expected)
         self.assertEqual(self.pkgconfig2.requires(), expected)
 
diff --git a/test/test_cerbero_ide_xcode_xcconfig.py b/test/test_cerbero_ide_xcode_xcconfig.py
index 5ce7d522..e5adf388 100644
--- a/test/test_cerbero_ide_xcode_xcconfig.py
+++ b/test/test_cerbero_ide_xcode_xcconfig.py
@@ -23,7 +23,7 @@ import tempfile
 from cerbero.ide.xcode.xcconfig import XCConfig
 
 
-XCCONFIG = '''
+XCCONFIG = """
 ALWAYS_SEARCH_USER_PATHS = YES
 USER_HEADER_SEARCH_PATHS = /usr/include/gstreamer-0.10\
  /usr/include/glib-2.0 /usr/lib/glib-2.0/include\
@@ -31,10 +31,10 @@ USER_HEADER_SEARCH_PATHS = /usr/include/gstreamer-0.10\
 LIBRARY_SEARCH_PATHS = 
 OTHER_LDFLAGS =  -lgstreamer-0.10 \
 -lgobject-2.0 -lgmodule-2.0 -lxml2 -lgthread-2.0 -lrt -lglib-2.0
-'''
+"""
 
-class TestPkgConfig(unittest.TestCase):
 
+class TestPkgConfig(unittest.TestCase):
     def setUp(self):
         pc_path = os.path.join(os.path.dirname(__file__), 'pkgconfig')
         os.environ['PKG_CONFIG_LIBDIR'] = pc_path
@@ -42,13 +42,13 @@ class TestPkgConfig(unittest.TestCase):
 
     def testFill(self):
         xcconfig = XCConfig('gstreamer-0.10')
-        expected = \
-            {'libs': ' -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 '
-                     '-lxml2 -lgthread-2.0 -lrt -lglib-2.0',
-             'hsp': '/usr/include/gstreamer-0.10 /usr/include/glib-2.0 '
-                    '/usr/lib/glib-2.0/include '
-                    '/usr/include/libxml2',
-             'lsp': ''}
+        expected = {
+            'libs': ' -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 ' '-lxml2 -lgthread-2.0 -lrt -lglib-2.0',
+            'hsp': '/usr/include/gstreamer-0.10 /usr/include/glib-2.0 '
+            '/usr/lib/glib-2.0/include '
+            '/usr/include/libxml2',
+            'lsp': '',
+        }
         self.assertEqual(expected, xcconfig._fill())
 
     def testXCConfig(self):
diff --git a/test/test_cerbero_packages_disttarball.py b/test/test_cerbero_packages_disttarball.py
index 8db2c98d..b7fb1edf 100644
--- a/test/test_cerbero_packages_disttarball.py
+++ b/test/test_cerbero_packages_disttarball.py
@@ -28,12 +28,11 @@ from test.test_build_common import add_files
 
 
 class DistTarballTest(unittest.TestCase):
-
     def setUp(self):
         self.config = DummyConfig()
         self.tmp = tempfile.mkdtemp()
         self.config.prefix = self.tmp
-        self.store =  create_store(self.config)
+        self.store = create_store(self.config)
         self.package = self.store.get_package('gstreamer-runtime')
         self.packager = DistTarball(self.config, self.package, self.store)
         add_files(self.tmp)
@@ -45,7 +44,7 @@ class DistTarballTest(unittest.TestCase):
         # Creates one package with the runtime files
         filenames = self.packager.pack(self.tmp, devel=False)
         self.assertEqual(len(filenames), 1)
-        tar = tarfile.open(filenames[0], "r:bz2")
+        tar = tarfile.open(filenames[0], 'r:bz2')
         tarfiles = sorted([x.path for x in tar.getmembers()])
         self.assertEqual(tarfiles, self.package.files_list())
 
@@ -54,10 +53,10 @@ class DistTarballTest(unittest.TestCase):
         # devel files
         filenames = self.packager.pack(self.tmp, devel=True)
         self.assertEqual(len(filenames), 2)
-        tar = tarfile.open(filenames[0], "r:bz2")
+        tar = tarfile.open(filenames[0], 'r:bz2')
         tarfiles = sorted([x.path for x in tar.getmembers()])
         self.assertEqual(tarfiles, self.package.files_list())
-        tar = tarfile.open(filenames[1], "r:bz2")
+        tar = tarfile.open(filenames[1], 'r:bz2')
         tarfiles = sorted([x.path for x in tar.getmembers()])
         self.assertEqual(tarfiles, self.package.devel_files_list())
 
@@ -65,6 +64,6 @@ class DistTarballTest(unittest.TestCase):
         # Creates 1 package, with the runtime files and the devel files
         filenames = self.packager.pack(self.tmp, devel=True, split=False)
         self.assertEqual(len(filenames), 1)
-        tar = tarfile.open(filenames[0], "r:bz2")
+        tar = tarfile.open(filenames[0], 'r:bz2')
         tarfiles = sorted([x.path for x in tar.getmembers()])
         self.assertEqual(tarfiles, self.package.all_files_list())
diff --git a/test/test_cerbero_packages_linux.py b/test/test_cerbero_packages_linux.py
index 9ac86fca..16118e6d 100644
--- a/test/test_cerbero_packages_linux.py
+++ b/test/test_cerbero_packages_linux.py
@@ -30,16 +30,13 @@ packed = []
 
 
 class LoggerPackager(linux.LinuxPackager):
-
     def pack(self, output_dir, devel, force, keep_temp, pack_deps, tmpdir):
         packed.append(self.package.name)
 
 
 class DummyPackager(linux.LinuxPackager):
-
     def build(self, output_dir, tarname, tmpdir, packagedir, srcdir):
-        linux.LinuxPackager.build(self, output_dir, tarname, tmpdir,
-                                  packagedir, srcdir)
+        linux.LinuxPackager.build(self, output_dir, tarname, tmpdir, packagedir, srcdir)
         return ['test']
 
     def create_tree(self, tmpdir):
@@ -48,9 +45,7 @@ class DummyPackager(linux.LinuxPackager):
 
 
 class DummyTarballPackager(PackagerBase):
-
-    def pack(self, output_dir, devel=True, force=False, split=True,
-             package_prefix=''):
+    def pack(self, output_dir, devel=True, force=False, split=True, package_prefix=''):
         return ['test']
 
 
@@ -58,12 +53,10 @@ linux.DistTarball = DummyTarballPackager
 
 
 class LinuxPackagesTest(unittest.TestCase):
-
     def setUp(self):
         self.config = Config()
         self.store = create_store(self.config)
-        self.packager = linux.LinuxPackager(self.config,
-            self.store.get_package('gstreamer-runtime'), self.store)
+        self.packager = linux.LinuxPackager(self.config, self.store.get_package('gstreamer-runtime'), self.store)
 
     def testInit(self):
         config = Config()
@@ -80,8 +73,7 @@ class LinuxPackagesTest(unittest.TestCase):
         config.packager = 'Pin <pan@p.un>'
         packager = linux.LinuxPackager(config, package, None)
         self.assertEqual(packager.package_prefix, 'test-')
-        self.assertEqual(packager.full_package_name,
-                          'test-gstreamer-test1-1.0')
+        self.assertEqual(packager.full_package_name, 'test-gstreamer-test1-1.0')
         self.assertEqual(packager.packager, 'Pin <pan@p.un>')
 
         # Test ignore package
@@ -92,10 +84,7 @@ class LinuxPackagesTest(unittest.TestCase):
 
     def testRequires(self):
         self.packager._empty_packages = []
-        expected = sorted(['gstreamer-test-bindings',
-                           'gstreamer-test2',
-                           'gstreamer-test3',
-                           'gstreamer-test1'])
+        expected = sorted(['gstreamer-test-bindings', 'gstreamer-test2', 'gstreamer-test3', 'gstreamer-test1'])
 
         requires = self.packager.get_requires(PackageType.RUNTIME, '-dev')
         self.assertEqual(expected, requires)
@@ -112,17 +101,14 @@ class LinuxPackagesTest(unittest.TestCase):
         self.assertEqual([x + '-dev' for x in expected], requires)
 
         # test empty packages
-        self.packager._empty_packages = \
-            [self.store.get_package('gstreamer-test2')]
+        self.packager._empty_packages = [self.store.get_package('gstreamer-test2')]
         requires = self.packager.get_requires(PackageType.RUNTIME, '-dev')
         expected.remove('gstreamer-test2')
         self.assertEqual(expected, requires)
 
     def testMetaPackageRequires(self):
         self.packager._empty_packages = []
-        expected = (['gstreamer-test1'],
-                    ['gstreamer-test3'],
-                    ['gstreamer-test-bindings'])
+        expected = (['gstreamer-test1'], ['gstreamer-test3'], ['gstreamer-test-bindings'])
         self.store.get_package('gstreamer-test1').has_runtime_package = True
         self.store.get_package('gstreamer-test3').has_runtime_package = True
         self.store.get_package('gstreamer-test-bindings').has_runtime_package = True
@@ -141,18 +127,12 @@ class LinuxPackagesTest(unittest.TestCase):
         for p in [self.store.get_package(x[0]) for x in expected]:
             p.has_devel_package = True
         requires = self.packager.get_meta_requires(PackageType.DEVEL, '-dev')
-        expected = (['gstreamer-test1-dev'],
-                    ['gstreamer-test3-dev'],
-                    ['gstreamer-test-bindings-dev'])
+        expected = (['gstreamer-test1-dev'], ['gstreamer-test3-dev'], ['gstreamer-test-bindings-dev'])
         self.assertEqual(expected, requires)
 
     def testPackDeps(self):
-        expected = sorted(['gstreamer-test-bindings',
-                           'gstreamer-test2',
-                           'gstreamer-test3',
-                           'gstreamer-test1'])
-        self.packager = LoggerPackager(self.config,
-            self.store.get_package('gstreamer-runtime'), self.store)
+        expected = sorted(['gstreamer-test-bindings', 'gstreamer-test2', 'gstreamer-test3', 'gstreamer-test1'])
+        self.packager = LoggerPackager(self.config, self.store.get_package('gstreamer-runtime'), self.store)
         self.packager.devel = False
         self.packager.force = False
         global packed
@@ -167,15 +147,13 @@ class LinuxPackagesTest(unittest.TestCase):
         packed = []
 
     def testPack(self):
-        self.packager = DummyPackager(self.config,
-            self.store.get_package('gstreamer-runtime'), self.store)
+        self.packager = DummyPackager(self.config, self.store.get_package('gstreamer-runtime'), self.store)
         paths = self.packager.pack('', False, True, True, False, None)
         self.assertTrue(os.path.exists('gstreamer-runtime-stamp'))
         os.remove('gstreamer-runtime-stamp')
         self.assertEqual(paths, ['test'])
 
-        self.packager = DummyPackager(self.config,
-            self.store.get_package('gstreamer-test1'), self.store)
+        self.packager = DummyPackager(self.config, self.store.get_package('gstreamer-test1'), self.store)
         paths = self.packager.pack('', False, True, True, False, None)
         self.assertTrue(os.path.exists('gstreamer-test1-stamp'))
         os.remove('gstreamer-test1-stamp')
diff --git a/test/test_cerbero_packages_osx_info_plist.py b/test/test_cerbero_packages_osx_info_plist.py
index e3394853..8734b2f5 100644
--- a/test/test_cerbero_packages_osx_info_plist.py
+++ b/test/test_cerbero_packages_osx_info_plist.py
@@ -19,30 +19,28 @@
 import unittest
 import tempfile
 
-from cerbero.packages.osx.info_plist import InfoPlist, FrameworkPlist,\
-        ApplicationPlist, INFO_PLIST_TPL
+from cerbero.packages.osx.info_plist import InfoPlist, FrameworkPlist, ApplicationPlist, INFO_PLIST_TPL
 
 
 class InfoPlistTest(unittest.TestCase):
-    
-    PROPS_TPL = ('%(icon)s<key>CFBundleIdentifier</key>\n'
-                 '<string>test.org</string>\n'
-                 '<key>CFBundleName</key>\n'
-                 '<string>test</string>\n'
-                 '<key>CFBundlePackageGetInfoString</key>\n'
-                 '<string>Test package</string>\n'
-                 '<key>CFBundlePackageType</key>\n'
-                 '<string>%(ptype)s</string>\n'
-                 '<key>CFBundleVersion</key>\n'
-                 '<string>1.0</string>')
+    PROPS_TPL = (
+        '%(icon)s<key>CFBundleIdentifier</key>\n'
+        '<string>test.org</string>\n'
+        '<key>CFBundleName</key>\n'
+        '<string>test</string>\n'
+        '<key>CFBundlePackageGetInfoString</key>\n'
+        '<string>Test package</string>\n'
+        '<key>CFBundlePackageType</key>\n'
+        '<string>%(ptype)s</string>\n'
+        '<key>CFBundleVersion</key>\n'
+        '<string>1.0</string>'
+    )
 
     def setUp(self):
-        self.info_plist = InfoPlist('test', 'test.org', '1.0',
-                                    'Test package')
+        self.info_plist = InfoPlist('test', 'test.org', '1.0', 'Test package')
 
     def testFormatProperty(self):
-        self.assertEqual('<key>Key</key>\n<string>Value</string>',
-                self.info_plist._format_property('Key', 'Value'))
+        self.assertEqual('<key>Key</key>\n<string>Value</string>', self.info_plist._format_property('Key', 'Value'))
 
     def testGetPropertiesString(self):
         result = self.info_plist._get_properties_string()
@@ -50,15 +48,13 @@ class InfoPlistTest(unittest.TestCase):
         self.assertEqual(result, expected)
 
     def testFrameworkPackageType(self):
-        self.info_plist = FrameworkPlist('test', 'test.org', '1.0',
-                                         'Test package')
+        self.info_plist = FrameworkPlist('test', 'test.org', '1.0', 'Test package')
         result = self.info_plist._get_properties_string()
         expected = self.PROPS_TPL % {'ptype': 'FMWK', 'icon': ''}
         self.assertEqual(result, expected)
 
     def testApplicationPackageType(self):
-        self.info_plist = ApplicationPlist('test', 'test.org', '1.0',
-                                           'Test package')
+        self.info_plist = ApplicationPlist('test', 'test.org', '1.0', 'Test package')
         result = self.info_plist._get_properties_string()
         expected = self.PROPS_TPL % {'ptype': 'APPL', 'icon': ''}
         self.assertEqual(result, expected)
@@ -66,9 +62,10 @@ class InfoPlistTest(unittest.TestCase):
     def testGetPropertiesStringWithIcon(self):
         self.info_plist.icon = 'test.ico'
         result = self.info_plist._get_properties_string()
-        expected = self.PROPS_TPL % {'ptype': '', 'icon':
-            self.info_plist._format_property('CFBundleIconFile', 'test.ico') +
-            '\n'}
+        expected = self.PROPS_TPL % {
+            'ptype': '',
+            'icon': self.info_plist._format_property('CFBundleIconFile', 'test.ico') + '\n',
+        }
         self.info_plist.icon = None
         self.assertEqual(result, expected)
 
@@ -77,7 +74,9 @@ class InfoPlistTest(unittest.TestCase):
         self.info_plist.save(tmp.name)
         with open(tmp.name, 'r') as f:
             result = f.read()
-        expected = INFO_PLIST_TPL % (self.info_plist.BEGIN,
-                                     self.info_plist._get_properties_string(),
-                                     self.info_plist.END)
+        expected = INFO_PLIST_TPL % (
+            self.info_plist.BEGIN,
+            self.info_plist._get_properties_string(),
+            self.info_plist.END,
+        )
         self.assertEqual(result, expected)
diff --git a/test/test_cerbero_packages_package.py b/test/test_cerbero_packages_package.py
index f4cd8839..1a3b5273 100644
--- a/test/test_cerbero_packages_package.py
+++ b/test/test_cerbero_packages_package.py
@@ -29,22 +29,18 @@ from test.test_common import DummyConfig
 
 
 class Config(DummyConfig):
-
     def __init__(self, tmp, platform):
         self.prefix = tmp
         self.target_platform = platform
 
 
 class PackageTest(unittest.TestCase):
-
     def setUp(self):
         self.tmp = tempfile.mkdtemp()
         win32config = Config(self.tmp, Platform.WINDOWS)
         linuxconfig = Config(self.tmp, Platform.LINUX)
-        self.win32package = Package1(win32config, create_store(win32config),
-                create_cookbook(win32config))
-        self.linuxpackage = Package1(linuxconfig, create_store(linuxconfig),
-                create_cookbook(linuxconfig))
+        self.win32package = Package1(win32config, create_store(win32config), create_cookbook(win32config))
+        self.linuxpackage = Package1(linuxconfig, create_store(linuxconfig), create_cookbook(linuxconfig))
 
     def tearDown(self):
         shutil.rmtree(self.tmp)
@@ -55,47 +51,65 @@ class PackageTest(unittest.TestCase):
         self.linuxpackage.set_mode(PackageType.DEVEL)
         self.assertEqual(self.linuxpackage.package_mode, PackageType.DEVEL)
         self.assertEqual(self.linuxpackage.name, 'gstreamer-test1-devel')
-        self.assertEqual(self.linuxpackage.shortdesc,
-            'GStreamer Test (Development Files)')
+        self.assertEqual(self.linuxpackage.shortdesc, 'GStreamer Test (Development Files)')
 
     def testParseFiles(self):
-        self.assertEqual(self.win32package._recipes_files['recipe1'],
-                ['misc', 'libs', 'bins'])
+        self.assertEqual(self.win32package._recipes_files['recipe1'], ['misc', 'libs', 'bins'])
         self.assertEqual(self.win32package._recipes_files['recipe5'], ['libs'])
 
     def testListRecipesDeps(self):
-        self.assertEqual(self.win32package.recipes_dependencies(),
-                          ['recipe1', 'recipe5', 'recipe2'])
-        self.assertEqual(self.linuxpackage.recipes_dependencies(),
-                          ['recipe1', 'recipe2'])
+        self.assertEqual(self.win32package.recipes_dependencies(), ['recipe1', 'recipe5', 'recipe2'])
+        self.assertEqual(self.linuxpackage.recipes_dependencies(), ['recipe1', 'recipe2'])
 
     def testFilesList(self):
         add_files(self.tmp)
-        winfiles = ['README', 'bin/gst-launch.exe', 'bin/libgstreamer-win32.dll',
-                'bin/libgstreamer-0.10.dll', 'bin/windows.exe',
-                'libexec/gstreamer-0.10/pluginsloader.exe',
-                'windows', 'bin/libtest.dll']
-        linuxfiles = ['README', 'bin/gst-launch', 'bin/linux',
-                'lib/libgstreamer-x11.so.1', 'lib/libgstreamer-0.10.so.1',
-                'libexec/gstreamer-0.10/pluginsloader', 'linux']
-
-        self.assertEqual(sorted(winfiles),
-            sorted(self.win32package.files_list()))
-        self.assertEqual(sorted(linuxfiles),
-            sorted(self.linuxpackage.files_list()))
+        winfiles = [
+            'README',
+            'bin/gst-launch.exe',
+            'bin/libgstreamer-win32.dll',
+            'bin/libgstreamer-0.10.dll',
+            'bin/windows.exe',
+            'libexec/gstreamer-0.10/pluginsloader.exe',
+            'windows',
+            'bin/libtest.dll',
+        ]
+        linuxfiles = [
+            'README',
+            'bin/gst-launch',
+            'bin/linux',
+            'lib/libgstreamer-x11.so.1',
+            'lib/libgstreamer-0.10.so.1',
+            'libexec/gstreamer-0.10/pluginsloader',
+            'linux',
+        ]
+
+        self.assertEqual(sorted(winfiles), sorted(self.win32package.files_list()))
+        self.assertEqual(sorted(linuxfiles), sorted(self.linuxpackage.files_list()))
 
     def testDevelFilesList(self):
         add_files(self.tmp)
         devfiles = ['lib/libgstreamer-0.10.a', 'lib/libgstreamer-0.10.la']
-        linuxdevfiles = devfiles + ['lib/libgstreamer-0.10.so',
-            'lib/libgstreamer-x11.a', 'lib/libgstreamer-x11.la',
-            'lib/libgstreamer-x11.so']
-        windevfiles = devfiles + ['lib/libgstreamer-win32.a',
-            'lib/libgstreamer-win32.dll.a', 'lib/libgstreamer-win32.la',
-            'lib/libgstreamer-win32.def', 'lib/gstreamer-win32.lib',
-            'lib/libtest.a', 'lib/libtest.dll.a', 'lib/libtest.la',
-            'lib/libtest.def', 'lib/test.lib', 'lib/libgstreamer-0.10.dll.a',
-            'lib/libgstreamer-0.10.def', 'lib/gstreamer-0.10.lib']
+        linuxdevfiles = devfiles + [
+            'lib/libgstreamer-0.10.so',
+            'lib/libgstreamer-x11.a',
+            'lib/libgstreamer-x11.la',
+            'lib/libgstreamer-x11.so',
+        ]
+        windevfiles = devfiles + [
+            'lib/libgstreamer-win32.a',
+            'lib/libgstreamer-win32.dll.a',
+            'lib/libgstreamer-win32.la',
+            'lib/libgstreamer-win32.def',
+            'lib/gstreamer-win32.lib',
+            'lib/libtest.a',
+            'lib/libtest.dll.a',
+            'lib/libtest.la',
+            'lib/libtest.def',
+            'lib/test.lib',
+            'lib/libgstreamer-0.10.dll.a',
+            'lib/libgstreamer-0.10.def',
+            'lib/gstreamer-0.10.lib',
+        ]
 
         self.assertEqual(sorted(windevfiles), self.win32package.devel_files_list())
         self.assertEqual(sorted(linuxdevfiles), self.linuxpackage.devel_files_list())
@@ -112,7 +126,6 @@ class PackageTest(unittest.TestCase):
 
 
 class TestMetaPackages(unittest.TestCase):
-
     def setUp(self):
         self.tmp = tempfile.mkdtemp()
         config = Config(self.tmp, Platform.LINUX)
@@ -124,8 +137,7 @@ class TestMetaPackages(unittest.TestCase):
 
     def _compareList(self, func_name):
         list_func = getattr(self.package, func_name)
-        packages = [self.store.get_package(x) for x in \
-                    self.package.list_packages()]
+        packages = [self.store.get_package(x) for x in self.package.list_packages()]
         files = []
         for package in packages:
             list_func = getattr(package, func_name)
@@ -135,18 +147,15 @@ class TestMetaPackages(unittest.TestCase):
         self.assertEqual(sorted(files), list_func())
 
     def testListPackages(self):
-        expected = ['gstreamer-test1', 'gstreamer-test3',
-                'gstreamer-test-bindings', 'gstreamer-test2']
+        expected = ['gstreamer-test1', 'gstreamer-test3', 'gstreamer-test-bindings', 'gstreamer-test2']
         self.assertEqual(self.package.list_packages(), expected)
 
     def testPlatfromPackages(self):
         packages_attr = object.__getattribute__(self.package, 'packages')
         self.assertEqual(len(packages_attr), 3)
-        platform_packages_attr = object.__getattribute__(self.package,
-                                                         'platform_packages')
+        platform_packages_attr = object.__getattribute__(self.package, 'platform_packages')
         self.assertEqual(len(platform_packages_attr), 1)
-        self.assertEqual(len(self.package.packages),
-                len(packages_attr) + len(platform_packages_attr))
+        self.assertEqual(len(self.package.packages), len(packages_attr) + len(platform_packages_attr))
 
     def testFilesList(self):
         self._compareList('files_list')
@@ -159,7 +168,6 @@ class TestMetaPackages(unittest.TestCase):
 
 
 class AppPackageTest(unittest.TestCase):
-
     def setUp(self):
         self.tmp = tempfile.mkdtemp()
         config = Config(self.tmp, Platform.LINUX)
diff --git a/test/test_cerbero_packages_packagemaker.py b/test/test_cerbero_packages_packagemaker.py
index 9e0ce4e1..c728546f 100644
--- a/test/test_cerbero_packages_packagemaker.py
+++ b/test/test_cerbero_packages_packagemaker.py
@@ -31,7 +31,6 @@ from test.test_common import DummyConfig
 
 
 class PackageMakerTest(unittest.TestCase):
-
     def setUp(self):
         self.tmp = tempfile.mkdtemp()
         self.config = DummyConfig()
@@ -60,7 +59,8 @@ class PackageMakerTest(unittest.TestCase):
         os.makedirs(bindir)
         os.makedirs(libdir)
         os.makedirs(os.path.join(self.tmp, 'libexec', 'gstreamer-0.10'))
-        shell.call('touch '
+        shell.call(
+            'touch '
             'README '
             'linux '
             'libexec/gstreamer-0.10/pluginsloader '
@@ -69,31 +69,30 @@ class PackageMakerTest(unittest.TestCase):
             'lib/libgstreamer-0.10.so.1 '
             'lib/libgstreamer-x11.so.1 '
             'lib/notincluded1 '
-            'notincluded2 ', self.tmp)
+            'notincluded2 ',
+            self.tmp,
+        )
 
 
 class DummyPackageMaker(PackageMaker):
-
     def _execute(self, cmd):
         self.cmd = cmd
 
 
 class TestPackageMaker(unittest.TestCase):
-    
-
     def testFillArgs(self):
         pm = PackageMaker()
-        args = {'r': 'root', 'i': 'pkg_id', 'n': 'version', 't': 'title',
-                'l': 'destination', 'o': 'output_file'}
+        args = {'r': 'root', 'i': 'pkg_id', 'n': 'version', 't': 'title', 'l': 'destination', 'o': 'output_file'}
         cmd = pm._cmd_with_args(args)
-        self.assertEqual(cmd,
-            "./PackageMaker  -i 'pkg_id' -l 'destination' -o 'output_file' "
-            "-n 'version' -r 'root' -t 'title'")
+        self.assertEqual(
+            cmd, "./PackageMaker  -i 'pkg_id' -l 'destination' -o 'output_file' " "-n 'version' -r 'root' -t 'title'"
+        )
 
     def testCreatePackage(self):
         pm = DummyPackageMaker()
-        pm.create_package('root', 'pkg_id', 'version', 'title',
-                          'output_file', 'destination')
-        self.assertEqual(pm.cmd,
+        pm.create_package('root', 'pkg_id', 'version', 'title', 'output_file', 'destination')
+        self.assertEqual(
+            pm.cmd,
             "./PackageMaker  -g '10.6' -i 'pkg_id' -l 'destination' -o 'output_file' "
-            "-n 'version' -r 'root' -t 'title'")
+            "-n 'version' -r 'root' -t 'title'",
+        )
diff --git a/test/test_cerbero_packages_packagesstore.py b/test/test_cerbero_packages_packagesstore.py
index 5f932933..088b4d12 100644
--- a/test/test_cerbero_packages_packagesstore.py
+++ b/test/test_cerbero_packages_packagesstore.py
@@ -21,13 +21,12 @@ import tempfile
 
 from cerbero.config import Platform
 from cerbero.errors import PackageNotFoundError
-from cerbero.packages.package import Package, MetaPackage, SDKPackage,\
-    InstallerPackage, App
+from cerbero.packages.package import Package, MetaPackage, SDKPackage, InstallerPackage, App
 from cerbero.packages.packagesstore import PackagesStore
 from test import test_packages_common as common
 
 
-PACKAGE = '''
+PACKAGE = """
 class Package(package.Package):
 
     name = 'test-package'
@@ -37,22 +36,22 @@ class Package(package.Package):
         Distro.WINDOWS
         DistroVersion.WINDOWS_7
         Architecture.X86
-'''
+"""
 
-SDKPACKAGE = '''
+SDKPACKAGE = """
 class SDKPackage(package.SDKPackage):
 
     name = 'test-package'
-'''
+"""
 
-INSTALLERPACKAGE = '''
+INSTALLERPACKAGE = """
 class InstallerPackage(package.InstallerPackage):
 
     name = 'test-package'
-'''
+"""
 
-class PackageTest(unittest.TestCase):
 
+class PackageTest(unittest.TestCase):
     def setUp(self):
         self.config = common.DummyConfig()
         self.config.packages_dir = '/test'
@@ -72,8 +71,7 @@ class PackageTest(unittest.TestCase):
         self.assertEqual(package, self.store.get_package(package.name))
 
     def testPackageNotFound(self):
-        self.assertRaises(PackageNotFoundError, self.store.get_package,
-            'unknown')
+        self.assertRaises(PackageNotFoundError, self.store.get_package, 'unknown')
 
     def testPackagesList(self):
         package = common.Package1(self.config, None, None)
@@ -84,28 +82,24 @@ class PackageTest(unittest.TestCase):
         self.assertEqual(l, self.store.get_packages_list())
 
     def testPackageDeps(self):
-        package = common.Package1(self.config, None,  None)
+        package = common.Package1(self.config, None, None)
         package2 = common.Package2(self.config, None, None)
         self.store.add_package(package)
         self.store.add_package(package2)
-        self.assertEqual(package.deps,
-            [x.name for x in self.store.get_package_deps(package.name)])
+        self.assertEqual(package.deps, [x.name for x in self.store.get_package_deps(package.name)])
 
     def testMetaPackageDeps(self):
         metapackage = common.MetaPackage(self.config, None)
         self.store.add_package(metapackage)
         # the metapackage depends on package that are not yet in the store
-        self.assertRaises(PackageNotFoundError,
-            self.store.get_package_deps, metapackage.name)
-        for klass in [common.Package1, common.Package2, common.Package3,
-                common.Package4]:
+        self.assertRaises(PackageNotFoundError, self.store.get_package_deps, metapackage.name)
+        for klass in [common.Package1, common.Package2, common.Package3, common.Package4]:
             p = klass(self.config, None, None)
             self.store.add_package(p)
         for klass in [common.MetaPackage]:
             p = klass(self.config, None)
             self.store.add_package(p)
-        deps = ['gstreamer-test-bindings', 'gstreamer-test1',
-                'gstreamer-test2', 'gstreamer-test3']
+        deps = ['gstreamer-test-bindings', 'gstreamer-test1', 'gstreamer-test2', 'gstreamer-test3']
         res = [x.name for x in self.store.get_package_deps(metapackage.name)]
         self.assertEqual(sorted(deps), sorted(res))
 
@@ -118,8 +112,7 @@ class PackageTest(unittest.TestCase):
         self.assertEqual('test-package', p.name)
 
     def testLoadMetaPackageFromFile(self):
-        for x, t in [(SDKPACKAGE, SDKPackage),
-                (INSTALLERPACKAGE, InstallerPackage)]:
+        for x, t in [(SDKPACKAGE, SDKPackage), (INSTALLERPACKAGE, InstallerPackage)]:
             package_file = tempfile.NamedTemporaryFile()
             package_file.write(x)
             package_file.flush()
@@ -137,4 +130,4 @@ class PackageTest(unittest.TestCase):
         try:
             p.test_imports()
         except ImportError as e:
-            self.fail("Import error raised, %s", e)
+            self.fail('Import error raised, %s', e)
diff --git a/test/test_cerbero_packages_pmdoc.py b/test/test_cerbero_packages_pmdoc.py
index 0694aefa..fb2d4f2e 100644
--- a/test/test_cerbero_packages_pmdoc.py
+++ b/test/test_cerbero_packages_pmdoc.py
@@ -31,14 +31,12 @@ from test.test_common import XMLMixin, DummyConfig
 
 
 class IndexTest(unittest.TestCase, XMLMixin):
-
     def setUp(self):
         self.config = DummyConfig()
         self.store = create_store(self.config)
         self.package = self.store.get_package('gstreamer-runtime')
         self.outdir = '/test'
-        self.index = Index(self.package, self.store, self.outdir, [],
-                PackageType.RUNTIME, False)
+        self.index = Index(self.package, self.store, self.outdir, [], PackageType.RUNTIME, False)
 
     def testAddRoot(self):
         self.index._add_root()
@@ -55,30 +53,24 @@ class IndexTest(unittest.TestCase, XMLMixin):
         self.assertEqual(len(properties.getchildren()), 6)
         self.check_text(properties, Index.TAG_ORGANIZATION, self.package.org)
         self.check_text(properties, Index.TAG_TITLE, self.package.title)
-        self.check_text(properties, Index.TAG_BUILD,
-                os.path.join(self.outdir, '%s.pkg' % self.package.name))
-        self.check_attrib(properties, Index.TAG_USER_SEES, 'ui',
-                Index.PROP_USER_SEES)
-        self.check_attrib(properties, Index.TAG_MIN_TARGET, 'os',
-                Index.PROP_MIN_TARGET)
-        self.check_attrib(properties, Index.TAG_DOMAIN, 'system',
-                Index.PROP_DOMAIN)
+        self.check_text(properties, Index.TAG_BUILD, os.path.join(self.outdir, '%s.pkg' % self.package.name))
+        self.check_attrib(properties, Index.TAG_USER_SEES, 'ui', Index.PROP_USER_SEES)
+        self.check_attrib(properties, Index.TAG_MIN_TARGET, 'os', Index.PROP_MIN_TARGET)
+        self.check_attrib(properties, Index.TAG_DOMAIN, 'system', Index.PROP_DOMAIN)
 
     def testAddDistribution(self):
         self.index._add_root()
         self.index._add_distribution()
         children = self.index.root.getchildren()
         self.assertEqual(len(children), 1)
-        dist =children[0]
+        dist = children[0]
         self.find_one(dist, Index.TAG_SCRIPTS)
-        self.check_attrib(dist, Index.TAG_VERSION, Index.ATTR_MIN_SPEC,
-                Index.MIN_SPEC)
+        self.check_attrib(dist, Index.TAG_VERSION, Index.ATTR_MIN_SPEC, Index.MIN_SPEC)
 
     def testAddDescription(self):
         self.index._add_root()
         self.index._add_description()
-        self.check_text(self.index.root, Index.TAG_DESCRIPTION,
-                self.package.shortdesc)
+        self.check_text(self.index.root, Index.TAG_DESCRIPTION, self.package.shortdesc)
 
     def testAddFlags(self):
         self.index._add_root()
@@ -92,7 +84,7 @@ class IndexTest(unittest.TestCase, XMLMixin):
         # 1 choice + 4 item
         self.assertEqual(len(children), 5)
         contents = self.find_one(self.index.root, Index.TAG_CONTENTS)
-        packages =[]
+        packages = []
 
         for choice in contents.iterfind(Index.TAG_CHOICE):
             if choice.attrib['id'] == 'gstreamer-test1':
@@ -104,21 +96,16 @@ class IndexTest(unittest.TestCase, XMLMixin):
             elif choice.attrib['id'] == 'gstreamer-test-bindings':
                 pkrefs = ['gstreamer-test-bindings']
             else:
-                self.fail("Incorrect choice %s" % choice)
-            elpkrefs = [x.attrib['id'] for x in \
-                        choice.iterfind(Index.TAG_PKGREF)]
-            self.assertEqual(sorted(["default.%s.%s" %
-                (self.config.target_arch, x) for x in pkrefs]),
-                              sorted(elpkrefs))
+                self.fail('Incorrect choice %s' % choice)
+            elpkrefs = [x.attrib['id'] for x in choice.iterfind(Index.TAG_PKGREF)]
+            self.assertEqual(sorted(['default.%s.%s' % (self.config.target_arch, x) for x in pkrefs]), sorted(elpkrefs))
             packages.extend(pkrefs)
 
-        items = [x.text[:-4] for x in self.index.root.iterfind(Index.TAG_ITEM) if
-                 x.attrib['type']=='pkgref']
+        items = [x.text[:-4] for x in self.index.root.iterfind(Index.TAG_ITEM) if x.attrib['type'] == 'pkgref']
         self.assertEqual(sorted(packages), sorted(items))
 
 
 class PkgRefTest(unittest.TestCase, XMLMixin):
-
     def setUp(self):
         self.config = DummyConfig()
         self.config.target_platform = Platform.LINUX
@@ -137,8 +124,7 @@ class PkgRefTest(unittest.TestCase, XMLMixin):
         self.pkgref._add_root()
         self.pkgref._add_scripts()
         scripts = self.find_one(self.pkgref.root, PkgRef.TAG_SCRIPTS)
-        self.check_text(scripts, PkgRef.TAG_SCRIPTS_DIR,
-                os.path.join(self.package_path, 'Contents', 'Resources'))
+        self.check_text(scripts, PkgRef.TAG_SCRIPTS_DIR, os.path.join(self.package_path, 'Contents', 'Resources'))
 
     def testAddExtra(self):
         self.pkgref._add_root()
@@ -151,8 +137,7 @@ class PkgRefTest(unittest.TestCase, XMLMixin):
         self.pkgref._add_root()
         self.pkgref._add_contents()
         contents = self.find_one(self.pkgref.root, PkgRef.TAG_CONTENTS)
-        self.check_text(contents, PkgRef.TAG_FILE_LIST, '%s-contents.xml' %
-                self.package.name)
+        self.check_text(contents, PkgRef.TAG_FILE_LIST, '%s-contents.xml' % self.package.name)
 
     def testAddConfig(self):
         self.pkgref._add_root()
@@ -166,21 +151,24 @@ class PkgRefTest(unittest.TestCase, XMLMixin):
         self.check_attrib(config, PkgRef.TAG_INSTALL_TO, 'mod', 'true')
         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',
-                'version', 'identifier']
+        mods = [
+            'installTo.isAbsoluteType',
+            'installTo.path',
+            'parent',
+            'installTo.isRelativeType',
+            'installTo',
+            'version',
+            'identifier',
+        ]
         docmods = [x.text for x in config.iterfind(PkgRef.TAG_MOD)]
         self.assertEqual(sorted(mods), sorted(docmods))
         flags = self.find_one(config, PkgRef.TAG_FLAGS)
         self.find_one(flags, PkgRef.TAG_FOLLOW_SYMLINKS)
 
 
-
 class PkgContentsWrap(PkgContents):
-
     dirs = ['.', './bin', './lib', './lib/gstreamer-0.10', '']
-    files = ['./bin/gst-inspect', './lib/libgstreamer.so.1.0',
-             './lib/gstreamer-0.10/libgstplugin.so', './README', '']
+    files = ['./bin/gst-inspect', './lib/libgstreamer.so.1.0', './lib/gstreamer-0.10/libgstplugin.so', './README', '']
 
     def _list_bom_dirs(self):
         return '\n'.join(self.dirs)
@@ -191,7 +179,6 @@ class PkgContentsWrap(PkgContents):
 
 
 class PkgContentsTest(unittest.TestCase, XMLMixin):
-
     def setUp(self):
         self.tmp = tempfile.mkdtemp()
         self.pkgcontents = PkgContentsWrap(self.tmp)
@@ -204,23 +191,26 @@ class PkgContentsTest(unittest.TestCase, XMLMixin):
 
     def testAddRoot(self):
         self.pkgcontents._add_root()
-        self.assertEqual(self.pkgcontents.root.tag,
-                PkgContents.TAG_PKG_CONTENTS)
+        self.assertEqual(self.pkgcontents.root.tag, PkgContents.TAG_PKG_CONTENTS)
         self.assertEqual(self.pkgcontents.root.attrib['spec'], PkgContents.SPEC_VERSION)
         self.assertEqual(len(self.pkgcontents.root.getchildren()), 0)
 
     def testAddPackageRoot(self):
         self.pkgcontents._add_root()
         self.pkgcontents._add_package_root()
-        for k, v in [('n', 'PackageRoot'), ('o', PkgContents.OWNER),
-                     ('g', PkgContents.GROUP), ('pt', '.'), ('m', 'true'),
-                     ('t', 'bom')]:
+        for k, v in [
+            ('n', 'PackageRoot'),
+            ('o', PkgContents.OWNER),
+            ('g', PkgContents.GROUP),
+            ('pt', '.'),
+            ('m', 'true'),
+            ('t', 'bom'),
+        ]:
             self.check_attrib(self.pkgcontents.root, PkgContents.TAG_F, k, v)
 
     def testFill(self):
         self.pkgcontents._fill()
-        children = [x for x in self.pkgcontents.proot.getchildren()
-                    if x.tag == PkgContents.TAG_F]
+        children = [x for x in self.pkgcontents.proot.getchildren() if x.tag == PkgContents.TAG_F]
         children_path = [x.attrib['n'] for x in children]
         self.assertEqual(sorted(children_path), sorted(['bin', 'lib', 'README']))
         for c in children:
@@ -229,16 +219,15 @@ class PkgContentsTest(unittest.TestCase, XMLMixin):
             elif c.attrib['n'] == 'lib':
                 for c in c.getchildren():
                     if c.attrib['n'] == 'gstreamer-0.10':
-                        self.check_attrib(c, PkgContents.TAG_F, 'n',
-                                         'libgstplugin.so')
+                        self.check_attrib(c, PkgContents.TAG_F, 'n', 'libgstplugin.so')
                     else:
                         self.assertEqual(c.attrib['n'], 'libgstreamer.so.1.0')
             else:
                 self.assertEqual(c.attrib['n'], 'README')
 
-class TestPMDoc(unittest.TestCase):
 
-    #if not sys.platform.startswith('darwin'):
+class TestPMDoc(unittest.TestCase):
+    # if not sys.platform.startswith('darwin'):
 
     def setUp(self):
         self.config = DummyConfig()
@@ -252,13 +241,12 @@ class TestPMDoc(unittest.TestCase):
     def tearDown(self):
         shutil.rmtree(self.tmp)
 
-    @unittest.skipUnless(sys.platform.startswith("darwin"), "requires OSX")
+    @unittest.skipUnless(sys.platform.startswith('darwin'), 'requires OSX')
     def testAllFilesCreated(self):
         d = dict()
-        packages = ['gstreamer-test1', 'gstreamer-test3',
-                    'gstreamer-test-bindings', 'gstreamer-test2']
+        packages = ['gstreamer-test1', 'gstreamer-test3', 'gstreamer-test-bindings', 'gstreamer-test2']
         for name in packages:
-            p =self.store.get_package(name)
+            p = self.store.get_package(name)
             d[p] = self.packages_path
         self.package.__file__ = ''
         pmdoc = PMDoc(self.package, self.store, self.tmp, d)
@@ -267,6 +255,6 @@ class TestPMDoc(unittest.TestCase):
 
         expected_files = ['index.xml']
         for p in packages:
-            expected_files.append("%s.xml" % p)
-            expected_files.append("%s-contents.xml" % p)
+            expected_files.append('%s.xml' % p)
+            expected_files.append('%s-contents.xml' % p)
         self.assertEqual(sorted(files), sorted(expected_files))
diff --git a/test/test_cerbero_packages_wix.py b/test/test_cerbero_packages_wix.py
index 4b0a55ba..81564d67 100644
--- a/test/test_cerbero_packages_wix.py
+++ b/test/test_cerbero_packages_wix.py
@@ -32,12 +32,17 @@ from test.test_common import DummyConfig
 
 class Recipe1(recipe.Recipe):
     name = 'recipe-test'
-    files_misc = ['bin/test.exe', 'bin/test2.exe', 'bin/test3.exe',
-                  'README', 'lib/libfoo.dll', 'lib/gstreamer-0.10/libgstplugins.dll']
+    files_misc = [
+        'bin/test.exe',
+        'bin/test2.exe',
+        'bin/test3.exe',
+        'README',
+        'lib/libfoo.dll',
+        'lib/gstreamer-0.10/libgstplugins.dll',
+    ]
 
 
 class Package(package.Package):
-
     name = 'gstreamer-test'
     shortdesc = 'GStreamer Test'
     longdesc = 'test'
@@ -48,7 +53,7 @@ class Package(package.Package):
     files = ['recipe-test:misc']
 
 
-MERGE_MODULE = '''\
+MERGE_MODULE = """\
 <?xml version="1.0" ?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Module Id="_gstreamer_test" Language="1033" Version="1.0">
@@ -81,33 +86,33 @@ MERGE_MODULE = '''\
 		</Directory>
 	</Module>
 </Wix>
-'''
+"""
 
 
 class MergeModuleTest(unittest.TestCase):
-
     def setUp(self):
         self.config = DummyConfig()
-        cb =  create_cookbook(self.config)
-        store =  create_store(self.config)
+        cb = create_cookbook(self.config)
+        store = create_store(self.config)
         cb.add_recipe(Recipe1(self.config))
         self.package = Package(self.config, store, cb)
-        self.mergemodule = MergeModule(self.config,
-                self.package.files_list(), self.package)
+        self.mergemodule = MergeModule(self.config, self.package.files_list(), self.package)
 
     def test_add_root(self):
         self.mergemodule._add_root()
         self.assertEqual(
-            '<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" />',
-                          etree.tostring(self.mergemodule.root))
+            '<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" />', etree.tostring(self.mergemodule.root)
+        )
 
     def test_add_module(self):
         self.mergemodule._add_root()
         self.mergemodule._add_module()
         self.assertEqual(
             '<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">'
-                '<Module Id="_gstreamer_test" Language="1033" Version="1.0" />'
-            '</Wix>', etree.tostring(self.mergemodule.root))
+            '<Module Id="_gstreamer_test" Language="1033" Version="1.0" />'
+            '</Wix>',
+            etree.tostring(self.mergemodule.root),
+        )
 
     def test_add_package(self):
         self.mergemodule._add_root()
@@ -115,11 +120,13 @@ class MergeModuleTest(unittest.TestCase):
         self.mergemodule._add_package()
         self.assertEqual(
             '<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">'
-                '<Module Id="_gstreamer_test" Language="1033" Version="1.0">'
-                    '<Package Comments="test" Description="GStreamer Test" Id="1" '
-                    'Manufacturer="GStreamer Project" />'
-                '</Module>'
-            '</Wix>', etree.tostring(self.mergemodule.root))
+            '<Module Id="_gstreamer_test" Language="1033" Version="1.0">'
+            '<Package Comments="test" Description="GStreamer Test" Id="1" '
+            'Manufacturer="GStreamer Project" />'
+            '</Module>'
+            '</Wix>',
+            etree.tostring(self.mergemodule.root),
+        )
 
     def test_add_root_dir(self):
         self.mergemodule._add_root()
@@ -128,12 +135,14 @@ class MergeModuleTest(unittest.TestCase):
         self.mergemodule._add_root_dir()
         self.assertEqual(
             '<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">'
-                '<Module Id="_gstreamer_test" Language="1033" Version="1.0">'
-                    '<Package Comments="test" Description="GStreamer Test" Id="1" '
-                    'Manufacturer="GStreamer Project" />'
-                    '<Directory Id="TARGETDIR" Name="SourceDir" />'
-                '</Module>'
-            '</Wix>', etree.tostring(self.mergemodule.root))
+            '<Module Id="_gstreamer_test" Language="1033" Version="1.0">'
+            '<Package Comments="test" Description="GStreamer Test" Id="1" '
+            'Manufacturer="GStreamer Project" />'
+            '<Directory Id="TARGETDIR" Name="SourceDir" />'
+            '</Module>'
+            '</Wix>',
+            etree.tostring(self.mergemodule.root),
+        )
 
     def test_add_directory(self):
         self.mergemodule._add_root()
@@ -168,11 +177,11 @@ class MergeModuleTest(unittest.TestCase):
 
     def test_render_xml(self):
         self.config.platform = Platform.WINDOWS
-        self.mergemodule._get_uuid = lambda : '1'
+        self.mergemodule._get_uuid = lambda: '1'
         self.mergemodule.fill()
         tmp = io.StringIO()
         self.mergemodule.write(tmp)
-        #self._compstr(tmp.getvalue(), MERGE_MODULE)
+        # self._compstr(tmp.getvalue(), MERGE_MODULE)
         self.assertEqual(MERGE_MODULE, tmp.getvalue())
 
     def _compstr(self, str1, str2):
@@ -182,12 +191,10 @@ class MergeModuleTest(unittest.TestCase):
             if str1[i] != str2[i]:
                 print(str1[i])
                 print(str2[i])
-                print("")
+                print('')
 
 
 class InstallerTest(unittest.TestCase):
-
-
     def setUp(self):
         pass
 
diff --git a/test/test_cerbero_tools_osxuniversalgenerator.py b/test/test_cerbero_tools_osxuniversalgenerator.py
index 3259238b..2abf7868 100644
--- a/test/test_cerbero_tools_osxuniversalgenerator.py
+++ b/test/test_cerbero_tools_osxuniversalgenerator.py
@@ -27,7 +27,7 @@ from cerbero.tools.osxuniversalgenerator import OSXUniversalGenerator
 from cerbero.tools.osxrelocator import OSXRelocator
 
 
-TEST_APP = '''\
+TEST_APP = """\
 #include<stdio.h>
 
 extern int foo1(int r);
@@ -36,28 +36,26 @@ int main(int arg_count,char ** arg_values)
 {
  printf("Hello World %%d\\n", foo1(1));
  return 0;
-}'''
+}"""
 
 
-TEST_LIB = '''\
+TEST_LIB = """\
 
 int foo1(int r);
 
 int foo1(int r) {
   return r;
-}'''
+}"""
 
 
 SHARED_LIBRARY = {
     Architecture.X86: 'Mach-O dynamically linked shared library i386',
-    Architecture.X86_64: 'Mach-O 64-bit dynamically linked shared library x86_64'}
-EXECUTABLE = {
-    Architecture.X86: 'Mach-O executable i386',
-    Architecture.X86_64: 'Mach-O 64-bit executable x86_64'}
+    Architecture.X86_64: 'Mach-O 64-bit dynamically linked shared library x86_64',
+}
+EXECUTABLE = {Architecture.X86: 'Mach-O executable i386', Architecture.X86_64: 'Mach-O 64-bit executable x86_64'}
 
 
-class  OSXUniversalGeneratorTest(unittest.TestCase):
-
+class OSXUniversalGeneratorTest(unittest.TestCase):
     def setUp(self):
         self.tmp = tempfile.mkdtemp()
         self._create_tree()
@@ -73,7 +71,7 @@ class  OSXUniversalGeneratorTest(unittest.TestCase):
         os.makedirs(self.tmp_sources)
 
     def _compile(self, arch):
-        main_c = os.path.join(self.tmp_sources,  'main.c')
+        main_c = os.path.join(self.tmp_sources, 'main.c')
         foo_c = os.path.join(self.tmp_sources, 'foo.c')
 
         libdir = os.path.join(self.tmp, arch, 'lib')
@@ -86,9 +84,7 @@ class  OSXUniversalGeneratorTest(unittest.TestCase):
         if arch == Architecture.X86:
             arch = 'i386'
         shell.call('gcc -arch %s -o %s -shared %s' % (arch, libfoo, foo_c))
-        shell.call('gcc -arch %s -o %s %s -L%s -lfoo' %
-                   (arch, test_app, main_c, libdir))
-
+        shell.call('gcc -arch %s -o %s %s -L%s -lfoo' % (arch, test_app, main_c, libdir))
 
     def _get_file_type(self, path):
         cmd = 'file -bh %s'
@@ -96,62 +92,50 @@ class  OSXUniversalGeneratorTest(unittest.TestCase):
 
     def _check_compiled_files(self):
         for arch in [Architecture.X86, Architecture.X86_64]:
-            res = self._get_file_type(
-                    os.path.join(self.tmp, arch, 'lib', 'libfoo.so'))
+            res = self._get_file_type(os.path.join(self.tmp, arch, 'lib', 'libfoo.so'))
             self.assertEqual(res, SHARED_LIBRARY[arch])
-            res = self._get_file_type(
-                    os.path.join(self.tmp, arch, 'bin', 'test_app'))
+            res = self._get_file_type(os.path.join(self.tmp, arch, 'bin', 'test_app'))
             self.assertEqual(res, EXECUTABLE[arch])
 
     def testMergeDirs(self):
         self._compile(Architecture.X86)
         self._compile(Architecture.X86_64)
         self._check_compiled_files()
-        gen = OSXUniversalGenerator(
-                os.path.join(self.tmp, Architecture.UNIVERSAL))
-        gen.merge_dirs([
-                os.path.join(self.tmp, Architecture.X86),
-                os.path.join(self.tmp, Architecture.X86_64)])
+        gen = OSXUniversalGenerator(os.path.join(self.tmp, Architecture.UNIVERSAL))
+        gen.merge_dirs([os.path.join(self.tmp, Architecture.X86), os.path.join(self.tmp, Architecture.X86_64)])
 
-        # bash-3.2$ file libfoo.so 
+        # bash-3.2$ file libfoo.so
         # libfoo.so: Mach-O universal binary with 2 architectures
         # libfoo.so (for architecture i386):	Mach-O dynamically linked shared library i386
         # libfoo.so (for architecture x86_64):	Mach-O 64-bit dynamically linked shared library x86_64
 
-        ftype = self._get_file_type(os.path.join(self.tmp,
-            Architecture.UNIVERSAL, 'lib', 'libfoo.so'))
+        ftype = self._get_file_type(os.path.join(self.tmp, Architecture.UNIVERSAL, 'lib', 'libfoo.so'))
         for arch in [Architecture.X86, Architecture.X86_64]:
             self.assertTrue(SHARED_LIBRARY[arch] in ftype)
-        ftype = self._get_file_type(os.path.join(self.tmp,
-            Architecture.UNIVERSAL, 'bin', 'test_app'))
+        ftype = self._get_file_type(os.path.join(self.tmp, Architecture.UNIVERSAL, 'bin', 'test_app'))
         for arch in [Architecture.X86, Architecture.X86_64]:
             self.assertTrue(EXECUTABLE[arch] in ftype)
 
     def testMergeFiles(self):
         for arch in [Architecture.X86, Architecture.X86_64]:
             with open(os.path.join(self.tmp, arch, 'share', 'test'), 'w') as f:
-                f.write("test")
-        gen = OSXUniversalGenerator(
-                os.path.join(self.tmp, Architecture.UNIVERSAL))
-        gen.merge_files(['share/test'],
-                [os.path.join(self.tmp, Architecture.X86),
-                 os.path.join(self.tmp, Architecture.X86_64)])
-        self.assertTrue(os.path.exists(os.path.join(self.tmp,
-        Architecture.UNIVERSAL, 'share', 'test')))
+                f.write('test')
+        gen = OSXUniversalGenerator(os.path.join(self.tmp, Architecture.UNIVERSAL))
+        gen.merge_files(
+            ['share/test'], [os.path.join(self.tmp, Architecture.X86), os.path.join(self.tmp, Architecture.X86_64)]
+        )
+        self.assertTrue(os.path.exists(os.path.join(self.tmp, Architecture.UNIVERSAL, 'share', 'test')))
 
     def testMergeCopyAndLink(self):
         for arch in [Architecture.X86, Architecture.X86_64]:
             file1 = os.path.join(self.tmp, arch, 'share', 'test1')
             file2 = os.path.join(self.tmp, arch, 'share', 'test2')
             with open(file1, 'w') as f:
-                f.write("test")
+                f.write('test')
             os.symlink(file1, file2)
 
-        gen = OSXUniversalGenerator(
-                os.path.join(self.tmp, Architecture.UNIVERSAL))
-        gen.merge_dirs([
-                os.path.join(self.tmp, Architecture.X86),
-                os.path.join(self.tmp, Architecture.X86_64)])
+        gen = OSXUniversalGenerator(os.path.join(self.tmp, Architecture.UNIVERSAL))
+        gen.merge_dirs([os.path.join(self.tmp, Architecture.X86), os.path.join(self.tmp, Architecture.X86_64)])
 
         file1 = os.path.join(self.tmp, Architecture.UNIVERSAL, 'share', 'test1')
         file2 = os.path.join(self.tmp, Architecture.UNIVERSAL, 'share', 'test2')
@@ -165,14 +149,12 @@ class  OSXUniversalGeneratorTest(unittest.TestCase):
             pc_file = os.path.join(self.tmp, arch, 'test.pc')
             with open(pc_file, 'w') as f:
                 f.write(os.path.join(self.tmp, arch, 'lib', 'test'))
-        gen = OSXUniversalGenerator(
-                os.path.join(self.tmp, Architecture.UNIVERSAL))
-        gen.merge_files(['test.pc'],
-                [os.path.join(self.tmp, Architecture.X86),
-                 os.path.join(self.tmp, Architecture.X86_64)])
+        gen = OSXUniversalGenerator(os.path.join(self.tmp, Architecture.UNIVERSAL))
+        gen.merge_files(
+            ['test.pc'], [os.path.join(self.tmp, Architecture.X86), os.path.join(self.tmp, Architecture.X86_64)]
+        )
         pc_file = os.path.join(self.tmp, Architecture.UNIVERSAL, 'test.pc')
-        self.assertEqual(open(pc_file).readline(),
-                os.path.join(self.tmp, Architecture.UNIVERSAL, 'lib', 'test'))
+        self.assertEqual(open(pc_file).readline(), os.path.join(self.tmp, Architecture.UNIVERSAL, 'lib', 'test'))
 
     def testMergedLibraryPaths(self):
         def check_prefix(path):
diff --git a/test/test_common.py b/test/test_common.py
index 7904b753..72d8caa0 100644
--- a/test/test_common.py
+++ b/test/test_common.py
@@ -28,7 +28,7 @@ class DummyConfig(object):
     sources = ''
     local_sources = ''
     wix_prefix = ''
-    py_prefix= ''
+    py_prefix = ''
     git_root = ''
     allow_parallel_build = False
     num_of_cpus = 1
@@ -39,21 +39,19 @@ class DummyConfig(object):
     install_dir = ''
 
 
-class XMLMixin():
-
+class XMLMixin:
     def find_one(self, el, tag):
         children = list(el.iterfind(tag))
         if len(children) == 0:
-            self.fail("Element with tag %s not found in parent %s" % (tag, el))
-        return children[0] 
+            self.fail('Element with tag %s not found in parent %s' % (tag, el))
+        return children[0]
 
     def check_attrib(self, parent, tag, attrib, value):
         n = self.find_one(parent, tag)
         if attrib not in n.attrib:
-            self.fail("Attribute %s not found in %s" % (attrib, n))
+            self.fail('Attribute %s not found in %s' % (attrib, n))
         self.assertEqual(n.attrib[attrib], value)
 
     def check_text(self, parent, tag, value):
         n = self.find_one(parent, tag)
         self.assertEqual(n.text, value)
-        
diff --git a/test/test_packages_common.py b/test/test_packages_common.py
index ff0e71c5..ae9af809 100644
--- a/test/test_packages_common.py
+++ b/test/test_packages_common.py
@@ -23,7 +23,6 @@ from test.test_build_common import create_cookbook
 
 
 class Package1(package.Package):
-
     name = 'gstreamer-test1'
     shortdesc = 'GStreamer Test'
     version = '1.0'
@@ -33,13 +32,10 @@ class Package1(package.Package):
     deps = ['gstreamer-test2']
 
     files = ['recipe1:misc:libs:bins']
-    platform_files = {
-            Platform.WINDOWS: ['recipe5:libs']
-            }
+    platform_files = {Platform.WINDOWS: ['recipe5:libs']}
 
 
 class Package2(package.Package):
-
     name = 'gstreamer-test2'
     shortdesc = 'GStreamer Test 2'
     version = '1.0'
@@ -51,7 +47,6 @@ class Package2(package.Package):
 
 
 class Package3(package.Package):
-
     name = 'gstreamer-test3'
     shortdesc = 'GStreamer Test 3'
     version = '1.0'
@@ -63,53 +58,49 @@ class Package3(package.Package):
 
 
 class Package4(package.Package):
-
     name = 'gstreamer-test-bindings'
     shortdesc = 'GStreamer Bindings'
     version = '1.0'
     licences = ['LGPL']
     uuid = '1'
     vendor = 'GStreamer Project'
-    sys_deps = {Distro.DEBIAN: ['python'],
-            DistroVersion.FEDORA_16: ['python27']}
+    sys_deps = {Distro.DEBIAN: ['python'], DistroVersion.FEDORA_16: ['python27']}
 
     files = ['recipe4:misc']
 
 
 class MetaPackage(package.MetaPackage):
-
-    name = "gstreamer-runtime"
-    shortdesc = "GStreamer runtime"
-    longdesc = "GStreamer runtime"
-    title = "GStreamer runtime"
-    url = "http://www.gstreamer.net"
+    name = 'gstreamer-runtime'
+    shortdesc = 'GStreamer runtime'
+    longdesc = 'GStreamer runtime'
+    title = 'GStreamer runtime'
+    url = 'http://www.gstreamer.net'
     version = '1.0'
     uuid = '3ffe67b2-4565-411f-8287-e8faa892f853'
-    vendor = "GStreamer Project"
+    vendor = 'GStreamer Project'
     org = 'net.gstreamer'
     packages = [
-                ('gstreamer-test1', True, True),
-                ('gstreamer-test3', False, True),
-                ('gstreamer-test-bindings', False, False)]
-    platform_packages = {
-            Platform.LINUX: [('gstreamer-test2', False, False)]}
-    icon = "gstreamer.ico"
+        ('gstreamer-test1', True, True),
+        ('gstreamer-test3', False, True),
+        ('gstreamer-test-bindings', False, False),
+    ]
+    platform_packages = {Platform.LINUX: [('gstreamer-test2', False, False)]}
+    icon = 'gstreamer.ico'
 
 
 class App(package.App):
-
-    name = "gstreamer-app"
-    shortdesc = "GStreamer sample app"
-    longdesc = "GStreamer sample app"
-    title = "GStreamer sample app"
-    url = "http://www.gstreamer.net"
+    name = 'gstreamer-app'
+    shortdesc = 'GStreamer sample app'
+    longdesc = 'GStreamer sample app'
+    title = 'GStreamer sample app'
+    url = 'http://www.gstreamer.net'
     version = '1.0'
     uuid = '3ffe67b2-4565-411f-8287-e8faa892f853'
-    vendor = "GStreamer Project"
+    vendor = 'GStreamer Project'
     org = 'net.gstreamer'
     app_recipe = 'recipe3'
     deps = ['gstreamer-test1']
-    icon = "share/images/gstreamer.png"
+    icon = 'share/images/gstreamer.png'
     embed_deps = True