Added method waitForJobEnd in BatchManager class.

[tools/libbatch.git] / src / Local / Test / Test_Local_SSH.cxx

diff --git a/src/Local/Test/Test_Local_SSH.cxx b/src/Local/Test/Test_Local_SSH.cxx
index 9db89170df071dd36c09069886d58475e17213d4..358a44b9b922b3cd66d268fd16ce67534bad9f26 100644 (file)
--- a/src/Local/Test/Test_Local_SSH.cxx
+++ b/src/Local/Test/Test_Local_SSH.cxx
@@ -38,12 +38,6 @@
 
 #include <SimpleParser.hxx>
 
-#ifdef WIN32
-#include <Windows.h>
-#define sleep(seconds) Sleep((seconds)*1000)
-#define usleep(useconds) Sleep((useconds)/1000)
-#endif
-
 using namespace std;
 using namespace Batch;
 
@@ -103,13 +97,7 @@ int main(int argc, char** argv)
     cout << jobid.__repr__() << endl;
 
     // Wait for the end of the job
-    string state = "Unknown";
-    for (int i=0 ; i<timeout*10 && state != FINISHED && state != FAILED ; i++) {
-      usleep(100000);
-      Versatile paramState = jobid.queryJob().getParametre()[STATE];
-      state = (paramState.size() > 0) ? paramState.str() : "Unknown";
-      cout << "Job state is: " << state << endl;
-    }
+    string state = bm->waitForJobEnd(jobid, timeout);
 
     if (state != FINISHED && state != FAILED) {
       cerr << "Error: Job not finished after timeout" << endl;