tps: make CLI inherit from Suite

parent 10a825fb
...@@ -120,29 +120,28 @@ def sha(blob, len=7): ...@@ -120,29 +120,28 @@ def sha(blob, len=7):
if len: if len:
return ret[:len] return ret[:len]
class Cli(cmd.Cmd): class Cli(cmd.Cmd, Suite):
def __init__(self, suite): def __init__(self, cfgfilename=default_config_file):
# Suite instance manipulated by this cli
self.suite = suite
cmd.Cmd.__init__(self) cmd.Cmd.__init__(self)
Suite.__init__(self, cfgfilename)
def do_board(self, arg): def do_board(self, arg):
if arg: if arg:
self.suite.board = arg self.board = arg
else: else:
print self.suite.board print self.board
def do_serial(self, arg): def do_serial(self, arg):
if arg: if arg:
self.suite.serial = arg self.serial = arg
else: else:
print self.suite.serial print self.serial
def do_path(self, arg): def do_path(self, arg):
if arg: if arg:
self.suite.path = arg self.path = arg
else: else:
print self.suite.path print self.path
def do_run(self, arg): def do_run(self, arg):
pass pass
...@@ -150,19 +149,19 @@ class Cli(cmd.Cmd): ...@@ -150,19 +149,19 @@ class Cli(cmd.Cmd):
pass pass
def do_save(self, arg): def do_save(self, arg):
self.suite.write_config() self.write_config()
def do_log(self, arg): def do_log(self, arg):
if arg: if arg:
self.suite.log = arg self.log = arg
else: else:
print self.suite.log print self.log
def do_log_path(self, arg): def do_log_path(self, arg):
if arg: if arg:
self.suite.log_path = arg self.log_path = arg
else: else:
print self.suite.log_path print self.log_path
def do_EOF(self, arg): def do_EOF(self, arg):
print print
...@@ -184,6 +183,7 @@ def main1(): ...@@ -184,6 +183,7 @@ def main1():
s.run() s.run()
def main2(): def main2():
s = Suite()
cli = Cli() cli = Cli()
cli.cmdloop() cli.cmdloop()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment