cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From DaanHoogland <...@git.apache.org>
Subject [GitHub] cloudstack pull request: CLOUDSTACK-8620 :skip test cases if rbd s...
Date Thu, 09 Jul 2015 12:31:49 GMT
Github user DaanHoogland commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/570#discussion_r34249648
  
    --- Diff: test/integration/component/test_ps_resize_volume.py ---
    @@ -48,59 +51,69 @@
                               RESOURCE_SECONDARY_STORAGE,
                               XEN_SERVER)
     
    +
     class TestResizeVolume(cloudstackTestCase):
     
         @classmethod
         def setUpClass(cls):
             cloudstackTestClient = super(TestResizeVolume,
    -                               cls).getClsTestClient()
    +                                     cls).getClsTestClient()
             cls.api_client = cloudstackTestClient.getApiClient()
    +        cls.hypervisor = cloudstackTestClient.getHypervisorInfo()
             # Fill services from the external config file
             cls.services = cloudstackTestClient.getParsedTestDataConfig()
             # Get Zone, Domain and templates
             cls.domain = get_domain(cls.api_client)
    -        cls.zone = get_zone(cls.api_client, cloudstackTestClient.getZoneForTests())
    +        cls.zone = get_zone(
    +            cls.api_client,
    +            cloudstackTestClient.getZoneForTests())
             cls.services["mode"] = cls.zone.networktype
    +        cls._cleanup = []
    +        cls.unsupportedStorageType = False
    +        if cls.hypervisor.lower() == 'lxc':
    +            if not find_storage_pool_type(cls.api_client, storagetype='rbd'):
    +                cls.unsupportedStorageType = True
    +                return
             cls.resourcetypemapping = {RESOURCE_PRIMARY_STORAGE: 10,
                                        RESOURCE_SECONDARY_STORAGE: 11}
     
    -
    -
             cls.template = get_template(
    -                            cls.api_client,
    -                            cls.zone.id,
    -                            cls.services["ostype"]
    -                            )
    +            cls.api_client,
    +            cls.zone.id,
    +            cls.services["ostype"]
    +        )
     
             cls.services["virtual_machine"]["zoneid"] = cls.zone.id
             cls.services["virtual_machine"]["template"] = cls.template.id
             cls.services["volume"]["zoneid"] = cls.zone.id
     
    -        cls._cleanup = []
             try:
                 cls.hypervisor = str(get_hypervisor_type(cls.api_client)).lower()
     
                 # Creating service offering with normal config
                 cls.service_offering = ServiceOffering.create(cls.api_client,
    -                                            cls.services["service_offering"])
    +                                                          cls.services["\
    --- End diff --
    
    this looks strange. are you sure you want to break the line within a string-literal?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message