Skip to content
Snippets Groups Projects
Commit d589abbc authored by Jonathan Hanks's avatar Jonathan Hanks
Browse files

Adding an integration test to ensure the daqd stops when there is a duplicate channel.

 * Updates to the test to make sure the daqd starts at a good time.
parent 6a5351d8
No related branches found
No related tags found
2 merge requests!656Merge 5.1 in to master,!650A minor cleanup of the channel duplication code.
import glob
import os
import os.path
......@@ -55,11 +56,19 @@ def daqd_not_running():
state = daqd.state()
return state not in (integration.Process.UNINITIALIZED, integration.Process.RUNNING)
def ini_files_available():
global ini_dir
global master_file
inis = glob.glob(os.path.join(ini_dir, "*.ini"))
pars = glob.glob(os.path.join(ini_dir, "*.par"))
return (len(inis) == len(pars)) and (len(inis)== 5) and os.path.exists(master_file)
integration.Sequence(
[
integration.require_readable(files=["/dev/gpstime", "/dev/mbuf"], description="required device files"),
fe_simulated_streams.run,
integration.wait_for(predicate=ini_files_available, description="ini and par files must exist", timeout=10),
insert_duplicates,
daqd.run,
daqd.ignore,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment