pinged refactor

diff --git a/exec/testcases/xenserver/tc/dotnetagentlicensing.py b/exec/testcases/xenserver/tc/dotnetagentlicensing.py
index 220880e7d6036ad5b9f9919b1c83ca59fa69eb5e..1c2e89fbaa8f8e1d08f132942d538f85db2b6029 100755 (executable)
--- a/exec/testcases/xenserver/tc/dotnetagentlicensing.py
+++ b/exec/testcases/xenserver/tc/dotnetagentlicensing.py
@@ -2,6 +2,7 @@
 from xenrt.lib.xenserver.dotnetagentlicensing import *
 from xenrt.enum import XenServerLicenseSKU
 from xenrt.lib.xenserver.licensing import LicenseManager, XenServerLicenseFactory
+import datetime
 
 class DotNetAgentAdapter(object):
 
@@ -75,8 +76,9 @@ class TempTest(DotNetAgentTestCases):
         autoupdate.enable()
         autoupdate.setURL("http://10.81.29.132:16000")
         #self.getGuest("server").execguest("wget localhost:16000")
+        startTime = datetime.datetime.now().time()
         self.getGuest("WS2012").reboot()
         xenrt.sleep(200)
-        xenrt.TEC().logverbose("test 1: %s"%str(server.isPinged(200)))
+        xenrt.TEC().logverbose("test 1: %s"%str(server.isPinged(startTime)))
 
 

diff --git a/exec/xenrt/lib/xenserver/dotnetagentlicensing.py b/exec/xenrt/lib/xenserver/dotnetagentlicensing.py
index 6aca7c9d70aeefa8ca295f84d573fdf7889941e2..6856470232942aa2651c42a63ef42dd3cc9995fb 100755 (executable)
--- a/exec/xenrt/lib/xenserver/dotnetagentlicensing.py
+++ b/exec/xenrt/lib/xenserver/dotnetagentlicensing.py
@@ -28,15 +28,14 @@ class SimpleServer(object):
         self.port = port
         self.guest = guest
 
-    def isPinged(self, wait):
+    def isPinged(self, startTime):
         xenrt.TEC().logverbose("Checking if Server with port:%s is pinged"%self.port)
         line = self.guest.execguest("tail -n 1 logs/server%s.log"%self.port)
         timeRE = re.search('(\d\d:){2}\d\d',line)
         if not timeRE:
             return False
-        logTime = (datetime.datetime.strptime(timeRE.group(0),'%H:%M:%S')+datetime.timedelta(seconds=wait)).time()
-        nowTime = datetime.datetime.now().time()
-        return logTime > nowTime
+        logTime = (datetime.datetime.strptime(timeRE.group(0),'%H:%M:%S'))
+        return logTime > startTime
 
     def moveFile(self, ssFile):
         if ssFile.location == "store/":