clean up logging

diff --git a/exec/testcases/xenserver/tc/dotnetagentlicensing.py b/exec/testcases/xenserver/tc/dotnetagentlicensing.py
index 9486a0f3400250e3e39f1904f0fac2336705a388..1f910f7432dd4d54528712a725ce30a34c1d3656 100755 (executable)
--- a/exec/testcases/xenserver/tc/dotnetagentlicensing.py
+++ b/exec/testcases/xenserver/tc/dotnetagentlicensing.py
@@ -240,11 +240,9 @@ class ToggleAUHierarchy(DotNetAgentTestCases):
         self.adapter.applyLicense(self.getDefaultPool())
         autoupdate = self.agent.getLicensedFeature("AutoUpdate")
         autoupdate.disable()
-        #assertions.assertTrue(autoupdate.checkKeyPresent() and not autoupdate.isActive(),"Xapi does not indicate that AutoUpdate is disabled")
-        assertions.assertTrue(self.getHost("RESOURCE_HOST_0").xenstoreExists("/guest_agent_features/Guest_agent_auto_update/parameters/enabled"),"Xapi does not indicate that AutoUpdate is disabled")
+        assertions.assertTrue(autoupdate.checkKeyPresent() and not autoupdate.isActive(),"Xapi does not indicate that AutoUpdate is disabled")
         autoupdate.setUserVMUser()
-        test = autoupdate.checkKeyPresent()
-        assertions.assertFalse(test)  # ,"DisableAutoUpdate reg key is present")
+        assertions.assertFalse(autoupdate.checkKeyPresent(),"DisableAutoUpdate reg key is present")
         self._shouldNotBePinged(trigger, server)
         autoupdate.enable()
         assertions.assertTrue(autoupdate.checkKeyPresent(), "DisableAutoUpdate reg key is not present")
@@ -337,6 +335,7 @@ class CheckDownloadedArch(DotNetAgentTestCases):
         autoupdate = self.agent.getLicensedFeature("AutoUpdate")
         autoupdate.enable()
         xenrt.sleep(60)
+        assertions.assertNotNone(autoupdate.checkDownloadedMSI(), "MSI did not download")
         assertions.assertTrue(autoupdate.compareMSIArch(),"Downloaded MSI is wrong architecture")
 
 class NoVSSOnNonServer(DotNetAgentTestCases):
@@ -355,7 +354,6 @@ class AUByDefault(DotNetAgentTestCases):
         self.adapter.lowerDotNetAgentVersion(self.win1)
         autoupdate = self.agent.getLicensedFeature("AutoUpdate")
         version = self.agent.agentVersion()
-        self.adapter.lowerDotNetAgentVersion()
         self.agent.restartAgent()
         xenrt.sleep(200)
         assertions.assertNotNone(autoupdate.checkDownloadedMSI(),"Agent did not download MSI")

diff --git a/exec/xenrt/lib/xenserver/dotnetagentlicensing.py b/exec/xenrt/lib/xenserver/dotnetagentlicensing.py
index 28e42c4b4638851f0ba36c5451f5a980a3d3cd82..81f5e4b9126d5ea9f42b7f4ffbb5adc98fb94396 100755 (executable)
--- a/exec/xenrt/lib/xenserver/dotnetagentlicensing.py
+++ b/exec/xenrt/lib/xenserver/dotnetagentlicensing.py
@@ -217,9 +217,7 @@ class VMUser(ActorImp):
         if self.os.winRegExists(self.HIVE_CONST, self.KEY_CONST, self.AU_CONST, healthCheckOnFailure=False):
             key = self.os.winRegLookup(self.HIVE_CONST, self.KEY_CONST, self.AU_CONST, healthCheckOnFailure=False)
             if key:
-                xenrt.TEC().logverbose("-----return True----")
                 return True
-        xenrt.TEC().logverbose("-----return False----")
         return False