From db8341bb359228044487526842de0caeb58a75f2 Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Thu, 25 Aug 2011 18:50:24 -0700
Subject: [PATCH] testClient: add timestamp for sync job

---
 tools/testClient/asyncJobMgr.py     | 6 ++++--
 tools/testClient/testcase/test_1.py | 2 +-
 tools/testClient/testcase/test_2.py | 7 +++----
 tools/testClient/testcase/test_3.py | 1 -
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/testClient/asyncJobMgr.py b/tools/testClient/asyncJobMgr.py
index 297ae1d0a7d..39ee80b4643 100644
--- a/tools/testClient/asyncJobMgr.py
+++ b/tools/testClient/asyncJobMgr.py
@@ -5,6 +5,7 @@ import Queue
 import copy
 import sys
 import jsonHelper
+import datetime
 
 class job(object):
     def __init__(self):
@@ -52,11 +53,12 @@ class workThread(threading.Thread):
             self.lock.acquire()
             
             if cmd.isAsync == "false":
-                jobstatus.startTime = time.time()
+                jobstatus.startTime = datetime.datetime.now()
                
                 result = self.connection.make_request(cmd)
                 jobstatus.result = result
-                jobstatus.endTime = time.time()
+                jobstatus.endTime = datetime.datetime.now()
+                jobstatus.duration = time.mktime(jobstatus.endTime.timetuple()) - time.mktime(jobstatus.startTime.timetuple())
             else:
                 result = self.connection.make_request(cmd, None, True)
                 if result is None:
diff --git a/tools/testClient/testcase/test_1.py b/tools/testClient/testcase/test_1.py
index c31c8569e17..bba55febc2e 100644
--- a/tools/testClient/testcase/test_1.py
+++ b/tools/testClient/testcase/test_1.py
@@ -1,7 +1,7 @@
 from cloudstackTestCase import *
 
 class TestCase1(cloudstackTestCase):
-    @unittest.skip("demonstrating skipping")
+
     def test_cloudstackapi(self):
         apiClient = self.testClient.getApiClient()
         listtmcmd = listTemplates.listTemplatesCmd()
diff --git a/tools/testClient/testcase/test_2.py b/tools/testClient/testcase/test_2.py
index ec11e22d8cb..5a78dc3e2d7 100644
--- a/tools/testClient/testcase/test_2.py
+++ b/tools/testClient/testcase/test_2.py
@@ -18,7 +18,6 @@ class TestCase2(cloudstackTestCase):
         listVMresponse = asyncJobResult[0].result
         self.debug("Total Number of Hosts: " + str(len(listVMresponse)))
     
-        '''  
-        for i in listhostresponse:
-            self.debug("id: " + i.id +" pod id: " + i.podid +" host tag: " + i.hosttags)
-        '''
\ No newline at end of file
+        for i in listVMresponse:
+            self.debug("id: " + str(i.id) +" pod id: " + str(i.podid) +" host tag: " + str(i.hosttags))
+        
\ No newline at end of file
diff --git a/tools/testClient/testcase/test_3.py b/tools/testClient/testcase/test_3.py
index 699ad3d6236..3f31e416ac3 100644
--- a/tools/testClient/testcase/test_3.py
+++ b/tools/testClient/testcase/test_3.py
@@ -26,7 +26,6 @@ class TestCase1(cloudstackTestCase):
                     self.zoneId = tmpl.zoneid
                     break
     
-    @unittest.skip("demonstrating skipping")
     def test_cloudstackapi(self):
         apiClient = self.testClient.getApiClient()