# Define all possible option for the test command : sat test <options>
parser = src.options.Options()
parser.add_option('b', 'base', 'string', 'base',
- _("Indicate the name of the test base to use.\n\tThis name has to be "
- "registered in your application and in a project.\n\tA path to a test "
- "base can also be used."))
+ _("Optional: Indicate the name of the test base to use.\n\tThis name has to"
+ " be registered in your application and in a project.\n\tA path to a "
+ "test base can also be used."))
parser.add_option('l', 'launcher', 'string', 'launcher',
- _("Use this option to specify the path to a SALOME launcher to use to "
- "launch the test scripts of the test base."))
-parser.add_option('m', 'module', 'list', 'modules',
- _('Indicate which module(s) to test (subdirectory of the test base).'))
-parser.add_option('t', 'type', 'list', 'types',
- _('Indicate which type(s) to test (subdirectory of the module).'))
+ _("Optional: Use this option to specify the path to a SALOME launcher to "
+ "use to launch the test scripts of the test base."))
+parser.add_option('g', 'grid', 'list', 'grids',
+ _('Optional: Indicate which grid(s) to test (subdirectory of the test '
+ 'base).'))
+parser.add_option('s', 'session', 'list', 'sessions',
+ _('Optional: indicate which session(s) to test (subdirectory of the '
+ 'grid).'))
parser.add_option('', 'display', 'string', 'display',
- _("Set the display where to launch SALOME."
+ _("Optional: set the display where to launch SALOME.\n"
"\tIf value is NO then option --show-desktop=0 will be used to launch SALOME."))
def description():
:return: The text to display for the test command description.
:rtype: str
'''
- return _("The test command runs a test base on a SALOME installation.")
+ return _("The test command runs a test base on a SALOME installation.\n\n"
+ "example:\nsat test SALOME-master --grid GEOM --session light")
def parse_option(args, config):
""" Parse the options and do some verifications about it
if not src.config_has_application(config):
raise src.SatException(_("An application is required to use a "
"relative path with option --appli"))
- options.launcher = os.path.join(config.APPLICATION.workdir, options.launcher)
+ options.launcher = os.path.join(config.APPLICATION.workdir,
+ options.launcher)
if not os.path.exists(options.launcher):
raise src.SatException(_("Launcher not found: %s") %
os.makedirs(outtestbase)
#logger.write(" copy testbase %s\n" % testbase, 5)
- for module_ in [m for m in os.listdir(intestbase) if os.path.isdir(
- os.path.join(intestbase, m))]:
+ for grid_ in [m for m in os.listdir(intestbase) if os.path.isdir(
+ os.path.join(intestbase, m))]:
# ignore source configuration directories
- if module_[:4] == '.git' or module_ == 'CVS':
+ if grid_[:4] == '.git' or grid_ == 'CVS':
continue
- outmodule = os.path.join(outtestbase, module_)
- inmodule = os.path.join(intestbase, module_)
- os.makedirs(outmodule)
- #logger.write(" copy module %s\n" % module_, 5)
+ outgrid = os.path.join(outtestbase, grid_)
+ ingrid = os.path.join(intestbase, grid_)
+ os.makedirs(outgrid)
+ #logger.write(" copy grid %s\n" % grid_, 5)
- if module_ == 'RESSOURCES':
- for file_name in os.listdir(inmodule):
- if not os.path.isfile(os.path.join(inmodule,
+ if grid_ == 'RESSOURCES':
+ for file_name in os.listdir(ingrid):
+ if not os.path.isfile(os.path.join(ingrid,
file_name)):
continue
- f = open(os.path.join(outmodule, file_name), "w")
- f.write(save_file(os.path.join(inmodule, file_name),
+ f = open(os.path.join(outgrid, file_name), "w")
+ f.write(save_file(os.path.join(ingrid, file_name),
finalPath))
f.close()
else:
- for type_name in [t for t in os.listdir(inmodule) if
- os.path.isdir(os.path.join(inmodule, t))]:
- outtype = os.path.join(outmodule, type_name)
- intype = os.path.join(inmodule, type_name)
- os.makedirs(outtype)
+ for session_name in [t for t in os.listdir(ingrid) if
+ os.path.isdir(os.path.join(ingrid, t))]:
+ outsession = os.path.join(outgrid, session_name)
+ insession = os.path.join(ingrid, session_name)
+ os.makedirs(outsession)
- for file_name in os.listdir(intype):
- if not os.path.isfile(os.path.join(intype,
+ for file_name in os.listdir(insession):
+ if not os.path.isfile(os.path.join(insession,
file_name)):
continue
if file_name.endswith('result.py'):
- shutil.copy2(os.path.join(intype, file_name),
- os.path.join(outtype, file_name))
+ shutil.copy2(os.path.join(insession, file_name),
+ os.path.join(outsession, file_name))
else:
- f = open(os.path.join(outtype, file_name), "w")
- f.write(save_file(os.path.join(intype,
+ f = open(os.path.join(outsession, file_name), "w")
+ f.write(save_file(os.path.join(insession,
file_name),
finalPath))
f.close()
##
# Creates the XML report for a product.
-def create_test_report(config, dest_path, stylesheet, xmlname=""):
+def create_test_report(config,
+ xml_history_path,
+ dest_path,
+ retcode,
+ xmlname=""):
+ # get the date and hour of the launching of the command, in order to keep
+ # history
+ date_hour = config.VARS.datehour
+
+ # Get some information to put in the xml file
application_name = config.VARS.application
withappli = src.config_has_application(config)
-
- root = etree.Element("salome")
- prod_node = etree.Element("product", name=application_name, build=xmlname)
- root.append(prod_node)
-
+
+ first_time = False
+ if not os.path.exists(xml_history_path):
+ first_time = True
+ root = etree.Element("salome")
+ prod_node = etree.Element("product", name=application_name, build=xmlname)
+ root.append(prod_node)
+ else:
+ root = etree.parse(xml_history_path).getroot()
+ prod_node = root.find("product")
+
+ prod_node.attrib["history_file"] = os.path.basename(xml_history_path)
+ prod_node.attrib["global_res"] = retcode
+
if withappli:
-
+ if not first_time:
+ for node in (prod_node.findall("version_to_download") +
+ prod_node.findall("out_dir")):
+ prod_node.remove(node)
+
add_simple_node(prod_node, "version_to_download",
config.APPLICATION.name)
add_simple_node(prod_node, "out_dir", config.APPLICATION.workdir)
# add environment
+ if not first_time:
+ for node in prod_node.findall("exec"):
+ prod_node.remove(node)
+
exec_node = add_simple_node(prod_node, "exec")
exec_node.append(etree.Element("env", name="Host", value=config.VARS.node))
exec_node.append(etree.Element("env", name="Architecture",
exec_node.append(etree.Element("env", name="Number of processors",
value=str(config.VARS.nb_proc)))
exec_node.append(etree.Element("env", name="Begin date",
- value=src.parse_date(config.VARS.datehour)))
+ value=src.parse_date(date_hour)))
exec_node.append(etree.Element("env", name="Command",
value=config.VARS.command))
exec_node.append(etree.Element("env", name="sat version",
value=config.INTERNAL.sat_version))
if 'TESTS' in config:
- tests = add_simple_node(prod_node, "tests")
- known_errors = add_simple_node(prod_node, "known_errors")
- new_errors = add_simple_node(prod_node, "new_errors")
- amend = add_simple_node(prod_node, "amend")
+ if first_time:
+ tests = add_simple_node(prod_node, "tests")
+ known_errors = add_simple_node(prod_node, "known_errors")
+ new_errors = add_simple_node(prod_node, "new_errors")
+ amend = add_simple_node(prod_node, "amend")
+ else:
+ tests = prod_node.find("tests")
+ known_errors = prod_node.find("known_errors")
+ new_errors = prod_node.find("new_errors")
+ amend = prod_node.find("amend")
+
tt = {}
for test in config.TESTS:
if not tt.has_key(test.testbase):
tt[test.testbase] = [test]
else:
tt[test.testbase].append(test)
-
+
for testbase in tt.keys():
- gn = add_simple_node(tests, "testbase")
+ if first_time:
+ gn = add_simple_node(tests, "testbase")
+ else:
+ gn = tests.find("testbase")
+ # initialize all grids and session to "not executed"
+ for mn in gn.findall("grid"):
+ mn.attrib["executed_last_time"] = "no"
+ for tyn in mn.findall("session"):
+ tyn.attrib["executed_last_time"] = "no"
+ for test_node in tyn.findall('test'):
+ for node in test_node.getchildren():
+ if node.tag != "history":
+ test_node.remove(node)
+
+ attribs_to_pop = []
+ for attribute in test_node.attrib:
+ if (attribute != "script" and
+ attribute != "res"):
+ attribs_to_pop.append(attribute)
+ for attribute in attribs_to_pop:
+ test_node.attrib.pop(attribute)
+
gn.attrib['name'] = testbase
nb, nb_pass, nb_failed, nb_timeout, nb_not_run = 0, 0, 0, 0, 0
- modules = {}
- types = {}
+ grids = {}
+ sessions = {}
for test in tt[testbase]:
- #print test.module
- if not modules.has_key(test.module):
- mn = add_simple_node(gn, "module")
- mn.attrib['name'] = test.module
- modules[test.module] = mn
+ if not grids.has_key(test.grid):
+ if first_time:
+ mn = add_simple_node(gn, "grid")
+ mn.attrib['name'] = test.grid
+ else:
+ l_mn = gn.findall("grid")
+ mn = None
+ for grid_node in l_mn:
+ if grid_node.attrib['name'] == test.grid:
+ mn = grid_node
+ break
+ if mn == None:
+ mn = add_simple_node(gn, "grid")
+ mn.attrib['name'] = test.grid
+
+ grids[test.grid] = mn
+
+ mn.attrib["executed_last_time"] = "yes"
+
+ if not sessions.has_key("%s/%s" % (test.grid, test.session)):
+ if first_time:
+ tyn = add_simple_node(mn, "session")
+ tyn.attrib['name'] = test.session
+ else:
+ l_tyn = mn.findall("session")
+ tyn = None
+ for session_node in l_tyn:
+ if session_node.attrib['name'] == test.session:
+ tyn = session_node
+ break
+ if tyn == None:
+ tyn = add_simple_node(mn, "session")
+ tyn.attrib['name'] = test.session
+
+ sessions["%s/%s" % (test.grid, test.session)] = tyn
- if not types.has_key("%s/%s" % (test.module, test.type)):
- tyn = add_simple_node(mn, "type")
- tyn.attrib['name'] = test.type
- types["%s/%s" % (test.module, test.type)] = tyn
+ tyn.attrib["executed_last_time"] = "yes"
for script in test.script:
- tn = add_simple_node(types[
- "%s/%s" % (test.module, test.type)], "test")
- tn.attrib['type'] = test.type
- tn.attrib['script'] = script.name
+ if first_time:
+ tn = add_simple_node(sessions[
+ "%s/%s" % (test.grid, test.session)],
+ "test")
+ tn.attrib['session'] = test.session
+ tn.attrib['script'] = script.name
+ hn = add_simple_node(tn, "history")
+ else:
+ l_tn = sessions["%s/%s" % (test.grid, test.session)].findall(
+ "test")
+ tn = None
+ for test_node in l_tn:
+ if test_node.attrib['script'] == script['name']:
+ tn = test_node
+ break
+
+ if tn == None:
+ tn = add_simple_node(sessions[
+ "%s/%s" % (test.grid, test.session)],
+ "test")
+ tn.attrib['session'] = test.session
+ tn.attrib['script'] = script.name
+ hn = add_simple_node(tn, "history")
+ else:
+ # Get or create the history node for the current test
+ if len(tn.findall("history")) == 0:
+ hn = add_simple_node(tn, "history")
+ else:
+ hn = tn.find("history")
+ # Put the last test data into the history
+ if 'res' in tn.attrib:
+ attributes = {"date_hour" : date_hour,
+ "res" : tn.attrib['res'] }
+ add_simple_node(hn,
+ "previous_test",
+ attrib=attributes)
+ for node in tn:
+ if node.tag != "history":
+ tn.remove(node)
+
if 'callback' in script:
try:
cnode = add_simple_node(tn, "callback")
if "amend" in script:
amend_test = add_simple_node(amend, "atest")
- amend_test.attrib['name'] = os.path.join(test.module,
- test.type,
+ amend_test.attrib['name'] = os.path.join(test.grid,
+ test.session,
script.name)
amend_test.attrib['reason'] = script.amend.decode(
"UTF-8")
if "known_error" in script:
kf_script = add_simple_node(known_errors, "error")
- kf_script.attrib['name'] = os.path.join(test.module,
- test.type,
+ kf_script.attrib['name'] = os.path.join(test.grid,
+ test.session,
script.name)
kf_script.attrib['date'] = script.known_error.date
kf_script.attrib[
elif script.res == src.KO_STATUS:
new_err = add_simple_node(new_errors, "new_error")
- script_path = os.path.join(test.module,
- test.type, script.name)
+ script_path = os.path.join(test.grid,
+ test.session, script.name)
new_err.attrib['name'] = script_path
new_err.attrib['cmd'] = ("sat testerror %s -s %s -c 'my"
" comment' -p %s" % \
gn.attrib['failed'] = str(nb_failed)
gn.attrib['timeout'] = str(nb_timeout)
gn.attrib['not_run'] = str(nb_not_run)
-
+
+ # Remove the res attribute of all tests that were not launched
+ # this time
+ for mn in gn.findall("grid"):
+ if mn.attrib["executed_last_time"] == "no":
+ for tyn in mn.findall("session"):
+ if tyn.attrib["executed_last_time"] == "no":
+ for test_node in tyn.findall('test'):
+ if "res" in test_node.attrib:
+ test_node.attrib.pop("res")
+
if len(xmlname) == 0:
xmlname = application_name
if not xmlname.endswith(".xml"):
src.xmlManager.write_report(os.path.join(dest_path, xmlname),
root,
- stylesheet)
+ "test.xsl")
+ src.xmlManager.write_report(xml_history_path,
+ root,
+ "test_history.xsl")
return src.OK_STATUS
+def generate_history_xml_path(config, test_base):
+ """Generate the name of the xml file that contain the history of the tests
+ on the machine with the current APPLICATION and the current test base.
+
+ :param config Config: The global configuration
+ :param test_base Str: The test base name (or path)
+ :return: the full path of the history xml file
+ :rtype: Str
+ """
+ history_xml_name = ""
+ if "APPLICATION" in config:
+ history_xml_name += config.APPLICATION.name
+ history_xml_name += "-"
+ history_xml_name += config.VARS.dist
+ history_xml_name += "-"
+ test_base_name = test_base
+ if os.path.exists(test_base):
+ test_base_name = os.path.basename(test_base)
+ history_xml_name += test_base_name
+ history_xml_name += ".xml"
+ log_dir = src.get_log_path(config)
+ return os.path.join(log_dir, "TEST", history_xml_name)
+
def run(args, runner, logger):
'''method that is called when salomeTools is called with test parameter.
'''
os.environ['DISPLAY'] = options.display
elif 'DISPLAY' not in os.environ:
# if no display set
- if ('display' in runner.cfg.SITE.test and
- len(runner.cfg.SITE.test.display) > 0):
+ if ('test' in runner.cfg.LOCAL and
+ 'display' in runner.cfg.LOCAL.test and
+ len(runner.cfg.LOCAL.test.display) > 0):
# use default value for test tool
- os.environ['DISPLAY'] = runner.cfg.SITE.test.display
+ os.environ['DISPLAY'] = runner.cfg.LOCAL.test.display
else:
os.environ['DISPLAY'] = "localhost:0.0"
# initialization
#################
if with_application:
- tmp_dir = runner.cfg.SITE.test.tmp_dir_with_application
+ tmp_dir = os.path.join(runner.cfg.VARS.tmp_root,
+ runner.cfg.APPLICATION.name,
+ "test")
else:
- tmp_dir = runner.cfg.SITE.test.tmp_dir
+ tmp_dir = os.path.join(runner.cfg.VARS.tmp_root,
+ "test")
# remove previous tmp dir
if os.access(tmp_dir, os.F_OK):
content = "\n".join(lines)
- # create hash from session information
+ # create hash from context information
dirname = sha1(content.encode()).hexdigest()
base_dir = os.path.join(tmp_dir, dirname)
os.makedirs(base_dir)
src.printcolors.print_value(logger, _('Display'), os.environ['DISPLAY'], 2)
src.printcolors.print_value(logger, _('Timeout'),
- runner.cfg.SITE.test.timeout, 2)
+ src.test_module.DEFAULT_TIMEOUT, 2)
src.printcolors.print_value(logger, _("Working dir"), base_dir, 3)
# create the test object
logger,
base_dir,
testbase=test_base,
- modules=options.modules,
- types=options.types,
+ grids=options.grids,
+ sessions=options.sessions,
launcher=options.launcher,
show_desktop=show_desktop)
+ if not test_runner.test_base_found:
+ # Fail
+ return 1
+
# run the test
logger.allowPrintLevel = False
retcode = test_runner.run_all_tests()
logger.write("\n", 2, False)
logger.write(_("\nGenerate the specific test log\n"), 5)
- out_dir = os.path.join(runner.cfg.SITE.log.log_dir, "TEST")
+ log_dir = src.get_log_path(runner.cfg)
+ out_dir = os.path.join(log_dir, "TEST")
src.ensure_path_exists(out_dir)
name_xml_board = logger.logFileName.split(".")[0] + "board" + ".xml"
+ historic_xml_path = generate_history_xml_path(runner.cfg, test_base)
+
create_test_report(runner.cfg,
+ historic_xml_path,
out_dir,
- "test.xsl",
+ retcode,
xmlname = name_xml_board)
xml_board_path = os.path.join(out_dir, name_xml_board)
logger.l_logFiles.append(xml_board_path)
"board",
retcode,
"Click on the link to get the detailed test results")
+
+ # Add the historic files into the log files list of the command
+ logger.l_logFiles.append(historic_xml_path)
+
+ logger.write(_("Removing the temporary directory: "
+ "rm -rf %s\n" % test_runner.tmp_working_dir), 5)
+ if os.path.exists(test_runner.tmp_working_dir):
+ shutil.rmtree(test_runner.tmp_working_dir)
return retcode
