From 91c046f35e6d284fce17f5f63f169a19487d87fa Mon Sep 17 00:00:00 2001
From: Dan Lamping <daniel.lamping@citrix.com>
Date: Sun, 22 Nov 2015 18:04:19 +0000
Subject: [PATCH] Increased uninstall deadline for pvdrivers

---
 exec/xenrt/lib/xenserver/guest.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/exec/xenrt/lib/xenserver/guest.py b/exec/xenrt/lib/xenserver/guest.py
index e16744beb..66642ee76 100755
--- a/exec/xenrt/lib/xenserver/guest.py
+++ b/exec/xenrt/lib/xenserver/guest.py
@@ -5800,6 +5800,10 @@ class TampaGuest(BostonGuest):
         # wait for reboot
         xenrt.sleep(6 * 60)
 
+        deadline = xenrt.util.timenow() + 1800
+        while not self.xmlrpcIsAlive() and xenrt.util.timenow() < deadline:
+            xenrt.sleep(30)
+
         if not self.xmlrpcIsAlive():
             raise xenrt.XRTFailure("XML-RPC not alive after tools uninstallation")
 
-- 
2.39.5