Changeset 1e58bb for tests/integration/StructureOptimization/testsuite-integration-structureoptimization-methane.at

Timestamp:

Apr 10, 2018, 6:42:56 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

AutomationFragmentation_failures, Candidate_v1.6.1, ChemicalSpaceEvaluator, Enhanced_StructuralOptimization_continued, Exclude_Hydrogens_annealWithBondGraph, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_contraction-expansion, Gui_displays_atomic_force_velocity, JobMarket_RobustOnKillsSegFaults, PythonUI_with_named_parameters, StoppableMakroAction, TremoloParser_IncreasedPrecision

Children:

a5c293

Parents:

456f19

git-author:

Frederik Heber <frederik.heber@…> (04/07/18 21:09:55)

git-committer:

Frederik Heber <frederik.heber@…> (04/10/18 06:42:56)

Message:

FIX: Integration tests now abort safely when one of the programs dies.

• I used the trick with running the program inside the script in the background, see ​https://stackoverflow.com/a/1645157/1967646, and using wait as in "​https://stackoverflow.com/a/29535256/1967646" to still obtain the exit code. This is used in the poolworker wrapper scripts.
• TESTS: Removed extra stored pid for worker_script. We now kill the wrapper script which in turn kills the executable.

File:

• tests/integration/StructureOptimization/testsuite-integration-structureoptimization-methane.at (modified) (1 diff)

tests/integration/StructureOptimization/testsuite-integration-structureoptimization-methane.at ¶

@@ -35 +35 @@
 # enlist a worker to work on jobs
 ../../molecuilder_poolworker -v 5 --server 127.0.0.1:${WORKERPORT} --hostname 127.0.0.1 --listen $WORKERLISTENPORT &
-worker_script_pid=$!
-worker_pid=`ps -ef | grep molecuilder_poolworker | grep $worker_script_pid | awk '{print $2}'`
+worker_pid=$!
 AT_CHECK([sleep 2], 0, [ignore], [ignore], [kill $server_pid $worker_pid])
 AT_CHECK([kill -s 0 $worker_pid], 0, [ignore], [ignore], [kill $server_pid $worker_pid])