napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update testmodule.py for new config structure.

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-08-06 12:36:10 +02:00
parent 8f10c21e5b
commit 5c8fa759b0
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/testmodule.py
View File

@ -34,11 +34,11 @@ except ImportError:
class Job: class Job:
def __init__(self, working_path, doc): def __init__(self, working_path, doc, cfg_doc):
self.module_name = doc["name"] self.module_name = doc["name"]
self.pretty_name = "Testing job " + doc["name"] self.pretty_name = "Testing job " + doc["name"]
self.working_path = working_path self.working_path = working_path
self.configuration = doc["configuration"] self.configuration = cfg_doc
def setprogress(self, progress): def setprogress(self, progress):
print("Job set progress to {}%.".format(progress * 100)) print("Job set progress to {}%.".format(progress * 100))
@ -47,9 +47,11 @@ class Job:
def main(): def main():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("moduledir", parser.add_argument("moduledir",
help="Dir containing the Python module") help="Dir containing the Python module.")
parser.add_argument("globalstorage_yaml", nargs="?", parser.add_argument("globalstorage_yaml", nargs="?",
help="A yaml file to initialize GlobalStorage") help="A yaml file to initialize GlobalStorage.")
parser.add_argument("configuration_yaml", nargs="?",
help="A yaml file to initialize the configuration dict.")
args = parser.parse_args() args = parser.parse_args()
print("Testing module in: " + args.moduledir) print("Testing module in: " + args.moduledir)
@ -62,16 +64,21 @@ def main():
print("Only Python jobs can be tested.") print("Only Python jobs can be tested.")
return 1 return 1
libcalamares.job = Job(args.moduledir, doc)
libcalamares.globalstorage = libcalamares.GlobalStorage()
# if a file for simulating globalStorage contents is provided, load it # if a file for simulating globalStorage contents is provided, load it
if args.globalstorage_yaml: if args.globalstorage_yaml:
with open(args.globalstorage_yaml) as f: with open(args.globalstorage_yaml) as f:
doc = yaml.load(f) gs_doc = yaml.load(f)
for key, value in doc.items(): for key, value in doc.items():
libcalamares.globalstorage.insert(key, value) libcalamares.globalstorage.insert(key, value)
cfg_doc = dict()
if args.configuration_yaml:
with open(args.configuration_yaml) as f:
cfg_doc = yaml.load(f)
libcalamares.job = Job(args.moduledir, doc, cfg_doc)
libcalamares.globalstorage = libcalamares.GlobalStorage()
scriptpath = os.path.abspath(args.moduledir) scriptpath = os.path.abspath(args.moduledir)
sys.path.append(scriptpath) sys.path.append(scriptpath)
import main import main