M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

fix tests, artiq_run after implementing scheduler defaults (#1290)

This commit is contained in:
Chris Ballance 2019-03-13 15:20:41 +00:00 committed by Robert Jördens
parent 5e7c83c9cf
commit fcf8828cb6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/frontend/artiq_run.py
View File

@ -149,7 +149,7 @@ def get_argparser(with_file=True):
def _build_experiment(device_mgr, dataset_mgr, args): def _build_experiment(device_mgr, dataset_mgr, args):
arguments = parse_arguments(args.arguments) arguments = parse_arguments(args.arguments)
argument_mgr = ProcessArgumentManager(arguments) argument_mgr = ProcessArgumentManager(arguments)
managers = (device_mgr, dataset_mgr, argument_mgr) managers = (device_mgr, dataset_mgr, argument_mgr, {})
if hasattr(args, "file"): if hasattr(args, "file"):
is_elf = args.file.endswith(".elf") is_elf = args.file.endswith(".elf")
is_ll = args.file.endswith(".ll") is_ll = args.file.endswith(".ll")

2
artiq/test/test_datasets.py
View File

@ -46,7 +46,7 @@ class ExperimentDatasetCase(unittest.TestCase):
# connection would marshal updates between dataset_mgr and dataset_db. # connection would marshal updates between dataset_mgr and dataset_db.
self.dataset_db = MockDatasetDB() self.dataset_db = MockDatasetDB()
self.dataset_mgr = DatasetManager(self.dataset_db) self.dataset_mgr = DatasetManager(self.dataset_db)
self.exp = TestExperiment((None, self.dataset_mgr, None)) self.exp = TestExperiment((None, self.dataset_mgr, None, None))
def test_set_local(self): def test_set_local(self):
with self.assertRaises(KeyError): with self.assertRaises(KeyError):