diff options
| -rw-r--r-- | devbot/config.py | 4 | ||||
| -rw-r--r-- | tests/devbot/test_config.py | 16 |
2 files changed, 4 insertions, 16 deletions
diff --git a/devbot/config.py b/devbot/config.py index d27a0cf..69e37e4 100644 --- a/devbot/config.py +++ b/devbot/config.py @@ -52,8 +52,8 @@ class Module: source_dir = self.get_source_dir() if os.path.exists(os.path.join(source_dir, "setup.py")): return "activity" - elif os.path.exists(os.path.join(source_dir, "autogen.sh")) or \ - os.path.exists(os.path.join(source_dir, "configure")): + elif (os.path.exists(os.path.join(source_dir, "autogen.sh")) or + os.path.exists(os.path.join(source_dir, "configure"))): return "autotools" else: print("The source directory has unexpected content, please " diff --git a/tests/devbot/test_config.py b/tests/devbot/test_config.py index f4d3260..9c12aa6 100644 --- a/tests/devbot/test_config.py +++ b/tests/devbot/test_config.py @@ -68,29 +68,17 @@ class TestConfig(common.DevbotTestCase): self.assertTrue(distro_info.supported) self.assertTrue(distro_info.valid) - def test_fedora_17_modules(self): - self._set_distro("fedora", "17") - - modules = config.load_modules() - self._assert_module(modules, "gnome-keyring") - self._assert_module(modules, "glib") - self._assert_module(modules, "gtk+") - self._assert_module(modules, "gstreamer") - self._assert_module(modules, "sugar") - - self._unset_distro() - def test_fedora_18_modules(self): self._set_distro("fedora", "18") self.assertEquals("fedora", distro.get_distro_info().name) self.assertEquals("18", distro.get_distro_info().version) modules = config.load_modules() - self._assert_no_module(modules, "glib") self._assert_no_module(modules, "gtk+") self._assert_no_module(modules, "gnome-keyring") self._assert_no_module(modules, "gstreamer") self._assert_module(modules, "sugar") + self._assert_module(modules, "glib") self._unset_distro() @@ -101,7 +89,7 @@ class TestConfig(common.DevbotTestCase): self._assert_module(modules, "glib") self._assert_no_module(modules, "gtk+") self._assert_no_module(modules, "gnome-keyring") - self._assert_no_module(modules, "gstreamer") + self._assert_module(modules, "gstreamer") self._assert_module(modules, "sugar") self._unset_distro() |