diff options
| -rwxr-xr-x | commands/check | 14 | ||||
| -rw-r--r-- | devbot/build.py | 1 | ||||
| -rw-r--r-- | devbot/main.py | 3 |
3 files changed, 14 insertions, 4 deletions
diff --git a/commands/check b/commands/check index 5c29599..89d92e0 100755 --- a/commands/check +++ b/commands/check @@ -4,6 +4,7 @@ import argparse import os import shutil import sys +import subprocess import common @@ -12,6 +13,7 @@ from devbot import check from devbot import command from devbot import main + def _get_profile(): profile_path = os.path.expanduser("~/.sugar/uitests") shutil.rmtree(profile_path, ignore_errors=True) @@ -83,6 +85,8 @@ def _check_devbot(): except subprocess.CalledProcessError: return False + return True + def _check_ui(): print "* Checking UI" @@ -95,14 +99,18 @@ def _check_ui(): def _run_checks(): + print "\n= Check =\n" + if not _check_devbot(): return False - if not _check_modules(): + if not check.check(): + return False + + if not _check_ui(): return False - if not check.check(): - sys.exit(1) + return True parser = argparse.ArgumentParser() diff --git a/devbot/build.py b/devbot/build.py index 1e69e7d..ba9adc8 100644 --- a/devbot/build.py +++ b/devbot/build.py @@ -12,7 +12,6 @@ from devbot import state from devbot import utils from devbot import release from devbot import git -from devbot import system _builders = {} _distributors = {} diff --git a/devbot/main.py b/devbot/main.py index c368ca7..0cac72e 100644 --- a/devbot/main.py +++ b/devbot/main.py @@ -9,6 +9,7 @@ from devbot import build from devbot import state from devbot import clean + def run_build(full=False): if full or state.full_build_is_required(): clean.clean(build_only=True) @@ -24,6 +25,8 @@ def run_build(full=False): if not build.build(full=False): return False + return True + def load_plugins(): for loader, name, ispkg in pkgutil.iter_modules(plugins.__path__): |