diff options
author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-12-28 17:05:40 (GMT) |
---|---|---|
committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-12-28 17:05:40 (GMT) |
commit | 02c54b8d30a5010f074cba3a51ee814f739730ea (patch) | |
tree | ee2b6303331156495ea2e30db76420774fe9ead9 | |
parent | 1b32c98f14766d3e956c52d6b803b19e5126c893 (diff) |
Build before testing
-rwxr-xr-x | commands/run-tests | 6 | ||||
-rw-r--r-- | devbot/test.py | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/commands/run-tests b/commands/run-tests index ace868f..64d1970 100755 --- a/commands/run-tests +++ b/commands/run-tests @@ -23,8 +23,7 @@ def _run_ui_tests(): logs_path = os.path.join(profile_path, "logs") run.collect_logs(logs_path) - if not result: - sys.exit(1) + return result parser = argparse.ArgumentParser() parser.add_argument("module", nargs="?", help="name of the module to test") @@ -40,4 +39,5 @@ else: if not test.test(): sys.exit(1) - _run_ui_tests() + if not _run_ui_tests(): + sys.exit(1) diff --git a/devbot/test.py b/devbot/test.py index d3bd0a0..2acd721 100644 --- a/devbot/test.py +++ b/devbot/test.py @@ -4,6 +4,7 @@ import subprocess from devbot import config from devbot import command from devbot import xvfb +from devbot import build def test_one(module_name): @@ -15,6 +16,9 @@ def test_one(module_name): def test(): + if not build.build(): + return False + modules = config.load_modules() for module in modules: if not _test_module(module): |