Changeset 2945e6

Timestamp:

May 10, 2017, 7:30:31 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_oldresults, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps

Children:

51a013

Parents:

ae14a1

git-author:

Frederik Heber <frederik.heber@…> (05/10/17 19:29:19)

git-committer:

Frederik Heber <frederik.heber@…> (05/10/17 19:30:31)

Message:

FIX: integration tests killed worker script not worker in error case.

• molecuilder_poolworker.in returns exit status of molecuilder_poolworker.

Location:

tests

Files:

• Calculations/molecuilder_poolworker.in (modified) (1 diff)
• Examples/molecuilder_poolworker.in (modified) (1 diff)
• integration/molecuilder_poolworker.in (modified) (1 diff)
• integration/testsuite-integration-mpqc-jobs.at (modified) (2 diffs)
• integration/testsuite-integration-vmg-jobs.at (modified) (2 diffs)

tests/Calculations/molecuilder_poolworker.in

@@ -14 +14 @@
         exit 127
 fi
+
+status=$?
+
+exit $status

tests/Examples/molecuilder_poolworker.in

@@ -14 +14 @@
         exit 127
 fi
+
+status=$?
+
+exit $status

tests/integration/molecuilder_poolworker.in

@@ -14 +14 @@
         exit 127
 fi
+
+status=$?
+
+exit $status

tests/integration/testsuite-integration-mpqc-jobs.at

@@ -1 +1 @@
 #
 #    MoleCuilder - creates and alters molecular systems
-#    Copyright (C) 2008-2012 University of Bonn
+#    Copyright (C) 2017 Frederik Heber
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -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_pid=$!
+worker_script_pid=$!
+worker_pid=`ps -ef | grep molecuilder_poolworker | grep $worker_script_pid | awk '{print $2}'`
 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])

tests/integration/testsuite-integration-vmg-jobs.at

@@ -1 +1 @@
 #
 #    MoleCuilder - creates and alters molecular systems
-#    Copyright (C) 2008-2012 University of Bonn
+#    Copyright (C) 2017 Frederik Heber
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -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_pid=$!
+worker_script_pid=$!
+worker_pid=`ps -ef | grep molecuilder_poolworker | grep $worker_script_pid | awk '{print $2}'`
 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])