Split up code to facilitate testing
This commit is contained in:
parent
dba440739a
commit
14e70638c3
13
dox/cmd.py
13
dox/cmd.py
@ -40,7 +40,7 @@ def setup_logging(level):
|
||||
logger.addHandler(handler)
|
||||
|
||||
|
||||
def main():
|
||||
def parse_args():
|
||||
parser = argparse.ArgumentParser(description='Run tests in docker.')
|
||||
parser.add_argument(dest='extra_args', nargs='*',
|
||||
help='args to append to command, or command to run'
|
||||
@ -62,10 +62,19 @@ def main():
|
||||
parser.add_argument('-n', '--noop', dest='noop', default=False,
|
||||
action='store_true',
|
||||
help="Don't actually execute commands")
|
||||
args = parser.parse_args()
|
||||
return parser.parse_args()
|
||||
|
||||
|
||||
def main():
|
||||
|
||||
args = parse_args()
|
||||
setup_logging(get_log_level(args))
|
||||
|
||||
run_dox(args)
|
||||
|
||||
|
||||
def run_dox(args):
|
||||
|
||||
image = args.image
|
||||
if args.image is None:
|
||||
image = dox.images.get_image()
|
||||
|
@ -47,7 +47,7 @@ class DoxYaml(object):
|
||||
return self._open_dox_yaml().get('image', image)
|
||||
|
||||
def get_commands(self, extra_args):
|
||||
return " ".join([self._open_dox_yaml().get('commands')] +extra_args)
|
||||
return " ".join([self._open_dox_yaml().get('commands')] + extra_args)
|
||||
|
||||
def get_prep_commands(self):
|
||||
return self._open_dox_yaml().get('prep')
|
||||
|
Loading…
Reference in New Issue
Block a user