From: JunWook Kwak <junwook.kwak@citrix.com>
Date: Wed, 18 Nov 2015 14:28:04 +0000 (+0000)
Subject: Fixed minor typo/bugs in .NetAgent TCs.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3ce4e5f4d24368f73798a100fd51a7292b180b98;p=xenrt-citrix%2Fxenrt.git

Fixed minor typo/bugs in .NetAgent TCs.
---

diff --git a/exec/testcases/xenserver/tc/dotnetagentlicensing.py b/exec/testcases/xenserver/tc/dotnetagentlicensing.py
index 560e6c17a..a5e197558 100755
--- a/exec/testcases/xenserver/tc/dotnetagentlicensing.py
+++ b/exec/testcases/xenserver/tc/dotnetagentlicensing.py
@@ -1,4 +1,4 @@
-import xenrt
+import xenrt
 from xenrt.lib.xenserver.dotnetagentlicensing import *
 from xenrt.enum import XenServerLicenseSKU
 from xenrt.lib.xenserver.licensing import LicenseManager, XenServerLicenseFactory
@@ -76,9 +76,9 @@ class DotNetAgentAdapter(object):
         elif guest.getInstance().os.fileExists("C:\\Windows\\System32\\config\\systemprofile\\AppData\\Local\\managementagentx86.msi"):
             guest.getInstance().os.removeFile("C:\\Windows\\System32\\config\\systemprofile\\AppData\\Local\\managementagentx86.msi")
 
-class NonCryptoMSI(object):
+class NonCryptoMSIHandler(object):
 
-    def installed(guest):
+    def installed(self, guest):
         os = guest.getInstance().os
         arch = os.getArch()
         if "64" in arch:
@@ -93,7 +93,7 @@ class NonCryptoMSI(object):
         else:
             return False
 
-    def getMSIs(server):
+    def getMSIs(self, server):
         server.guest.execguest("wget '%s/citrixguestagent-Noncrypto.tgz'"%(xenrt.TEC().lookup("TEST_TARBALL_BASE")))
         server.guest.execguest("tar -xf citrixguestagent-Noncrypto.tgz")
         server.guest.execguest("mv citrixguestagent-Noncrypto/managementagentx64.msi managementagentx64.msi")
@@ -386,7 +386,8 @@ class NonCryptoMSI(DotNetAgentTestCases):
     def run(self, arglist):
         server = self.adapter.setUpServer(self.getGuest("server"),"16000")
         server.createCatalog("99.0.0.0")
-        NonCryptoMSI().getMSIs(server)
+        msiHandler = NonCryptoMSIHandler()
+        msiHandler.getMSIs(server)
         self.adapter.applyLicense(self.getDefaultPool())
         autoupdate = self.agent.getLicensedFeature("AutoUpdate")
         autoupdate.enable()
@@ -394,7 +395,7 @@ class NonCryptoMSI(DotNetAgentTestCases):
         self.agent.restartAgent()
         xenrt.sleep(200)
         assertions.assertNotNone(autoupdate.checkDownloadedMSI(),"msi has not downloaded")
-        assertions.assertFalse(NonCryptoMSI.installed(self.win1),"Non cryprographically signed msi installed")
+        assertions.assertFalse(msiHandler.installed(self.win1),"Non cryprographically signed msi installed")
 
 class NoServerSurvive(DotNetAgentTestCases):
 
@@ -405,4 +406,4 @@ class NoServerSurvive(DotNetAgentTestCases):
         autoupdate.setURL("http://localhost:55555")
         self.agent.restartAgent()
         xenrt.sleep(60)
-        assertions.assertTrue(self.agent.isAgentAlive(), "Agent Stopped")
\ No newline at end of file
+        assertions.assertTrue(self.agent.isAgentAlive(), "Agent Stopped")