From: Craig Orendi <craig.orendi@citrix.com>
Date: Fri, 2 Oct 2015 11:48:13 +0000 (+0100)
Subject: change redirects add ps -uax
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b7700d28761e73215a82060527563460c9d6d8d4;p=xenrt-citrix%2Fxenrt.git

change redirects add ps -uax
---

diff --git a/exec/testcases/xenserver/tc/dotnetagentlicensing.py b/exec/testcases/xenserver/tc/dotnetagentlicensing.py
index 8ffe36c5e..834e3679d 100755
--- a/exec/testcases/xenserver/tc/dotnetagentlicensing.py
+++ b/exec/testcases/xenserver/tc/dotnetagentlicensing.py
@@ -67,6 +67,7 @@ class DotNetAgentAdapter(object):
         guest.execguest(" echo \"file contents\" > store/dotNetAgent.msi")  
         msi = {"dotNetAgent" : SSFile("dotNetAgent.msi","store/")}
         guest.execguest("python -m SimpleHTTPServer {0} > logs/server{0}.log 2>&1&".format(str(port)))
+        guest.execguest("ps -uax")
         return SimpleServer(str(port), msi, guest)
 
 class DotNetAgentTestCases(xenrt.TestCase):
@@ -181,5 +182,8 @@ class ToggleAUHierarchy(DotNetAgentTestCases):
         self.adapter.applyLicense(self.getDefaultPool())
         autoupdate = self.agent.getLicensedFeature("AutoUpdate")
         autoupdate.disable()
-        if not autoupdate.checkKeyPresent() or autoupdate.isActive():
-            raise xenrt.XRTFailure("Xapi does not indicate that AutoUpdate is disabled")
\ No newline at end of file
+        if autoupdate.checkKeyPresent() and autoupdate.isActive():
+            pass
+        else:
+            raise xenrt.XRTFailure("Xapi does not indicate that AutoUpdate is disabled")
+        autoupdate.setUserVMUser()
\ No newline at end of file
diff --git a/exec/xenrt/lib/xenserver/dotnetagentlicensing.py b/exec/xenrt/lib/xenserver/dotnetagentlicensing.py
index 7b3045d3b..33ad1add6 100755
--- a/exec/xenrt/lib/xenserver/dotnetagentlicensing.py
+++ b/exec/xenrt/lib/xenserver/dotnetagentlicensing.py
@@ -52,8 +52,8 @@ class SimpleServer(object):
         self.ssFiles.pop(key,None)
 
     def addRedirect(self):
-        #self.guest.execguest("printf \"HTTP/1.1 301 Moved Permanently\\nLocation: http://%s:16000\\n\" | nc -l 15000&"%(self.getIP()), timeout=10)
-        self.guest.execguest("nc -l 15000&", timeout=10)
+        self.guest.execguest("printf \"HTTP/1.1 301 Moved Permanently\\nLocation: http://%s:16000\\n\" | nc -l 15000 >/dev/null 2>&1&"%(self.getIP()), timeout=10)
+        self.guest.execguest("ps -uax")
 
     def getIP(self):
         return self.guest.getIP()