address comment

Author: Pearl1594

test/integration/smoke/test_nonstrict_affinity_group.py

@@ -21,6 +21,7 @@
 
 import logging
 
+from marvin.codes import FAILED
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase
 from marvin.cloudstackAPI import startVirtualMachine, stopVirtualMachine, destroyVirtualMachine
@@ -56,10 +57,10 @@ def setUpClass(cls):
         zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
         cls.zone = Zone(zone.__dict__)
         cls.hypervisor = cls.testClient.getHypervisorInfo()
-        if cls.hypervisor.lower() not in ["xenserver"]:
-            cls.template = get_template(cls.apiclient, cls.zone.id)
-        else:
-            cls.template = get_test_template(cls.apiclient, cls.zone.id, cls.hypervisor)
+        cls.template = get_test_template(cls.apiclient, cls.zone.id, cls.hypervisor)
+        if cls.template == FAILED:
+            assert False, "get_test_template() failed to return template\
+                        with hypervisor %s" % cls.hypervisor
         cls._cleanup = []
 
         cls.logger = logging.getLogger("TestNonStrictAffinityGroups")