bit of a hack, but removed unicode checking.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/25e2d161 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/25e2d161 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/25e2d161 Branch: refs/heads/trunk Commit: 25e2d161bcfc38c7aed1b06b4ccc6f9613460f38 Parents: cd6b813 Author: Anthony Shaw <anthonys...@apache.org> Authored: Thu Apr 13 11:51:30 2017 +1000 Committer: Anthony Shaw <anthonys...@apache.org> Committed: Thu Apr 13 11:51:30 2017 +1000 ---------------------------------------------------------------------- .../compute/fixtures/ecs/describe_images.xml | 41 ++++++++++++++++++++ .../compute/fixtures/ecs/describe_regions.xml | 18 ++++----- .../compute/fixtures/ecs/describe_zones.xml | 2 +- .../fixtures/ecs/pages_describe_images.xml | 2 +- .../ecs/pages_describe_images_page2.xml | 2 +- libcloud/test/compute/test_ecs.py | 4 +- 6 files changed, 54 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/25e2d161/libcloud/test/compute/fixtures/ecs/describe_images.xml ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/ecs/describe_images.xml b/libcloud/test/compute/fixtures/ecs/describe_images.xml index e69de29..afc3836 100644 --- a/libcloud/test/compute/fixtures/ecs/describe_images.xml +++ b/libcloud/test/compute/fixtures/ecs/describe_images.xml @@ -0,0 +1,41 @@ +<?xml version='1.0' encoding='UTF-8'?> +<DescribeImagesResponse> + <PageNumber>1</PageNumber> + <TotalCount>1</TotalCount> + <PageSize>10</PageSize> + <RegionId>cn-qingdao</RegionId> + <RequestId>FAD4D9B9-D75F-4A9E-BC13-991C0F06F50F</RequestId> + <Images> + <Image> + <ImageId>freebsd1001_64_20G_aliaegis_20150527.vhd</ImageId> + <Description>freebsd1001_64_20G_aliaegis_20150527.vhd</Description> + <ProductCode></ProductCode> + <OSType>linux</OSType> + <Architecture>x86_64</Architecture> + <OSName>FreeBSD 10.1 64</OSName> + <DiskDeviceMappings> + <DiskDeviceMapping> + <ImportOSSObject></ImportOSSObject> + <Format></Format> + <Device>/dev/xvda</Device> + <SnapshotId></SnapshotId> + <ImportOSSBucket></ImportOSSBucket> + <Size>20</Size> + </DiskDeviceMapping> + </DiskDeviceMappings> + <ImageOwnerAlias>system</ImageOwnerAlias> + <Progress>100%</Progress> + <Usage>instance</Usage> + <CreationTime>2015-06-19T07:25:42Z</CreationTime> + <Tags /> + <ImageVersion>1.0.0</ImageVersion> + <Status>Available</Status> + <ImageName>freebsd1001_64_20G_aliaegis_20150527.vhd</ImageName> + <IsSelfShared></IsSelfShared> + <IsCopied>false</IsCopied> + <IsSubscribed>false</IsSubscribed> + <Platform>Freebsd</Platform> + <Size>20</Size> + </Image> + </Images> +</DescribeImagesResponse> http://git-wip-us.apache.org/repos/asf/libcloud/blob/25e2d161/libcloud/test/compute/fixtures/ecs/describe_regions.xml ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/ecs/describe_regions.xml b/libcloud/test/compute/fixtures/ecs/describe_regions.xml index 91fef57..7b0fbd5 100644 --- a/libcloud/test/compute/fixtures/ecs/describe_regions.xml +++ b/libcloud/test/compute/fixtures/ecs/describe_regions.xml @@ -4,39 +4,39 @@ <Regions> <Region> <RegionId>ap-southeast-1</RegionId> - <LocalName>äºå¤ªï¼æ°å å¡ï¼</LocalName> + <LocalName></LocalName> </Region> <Region> <RegionId>cn-shenzhen</RegionId> - <LocalName>æ·±å³</LocalName> + <LocalName></LocalName> </Region> <Region> <RegionId>cn-qingdao</RegionId> - <LocalName>éå²</LocalName> + <LocalName></LocalName> </Region> <Region> <RegionId>cn-beijing</RegionId> - <LocalName>å京</LocalName> + <LocalName></LocalName> </Region> <Region> <RegionId>cn-shanghai</RegionId> - <LocalName>ä¸æµ·</LocalName> + <LocalName></LocalName> </Region> <Region> <RegionId>us-east-1</RegionId> - <LocalName>ç¾ä¸å¼åå°¼äº</LocalName> + <LocalName></LocalName> </Region> <Region> <RegionId>cn-hongkong</RegionId> - <LocalName>é¦æ¸¯</LocalName> + <LocalName></LocalName> </Region> <Region> <RegionId>cn-hangzhou</RegionId> - <LocalName>æå·</LocalName> + <LocalName></LocalName> </Region> <Region> <RegionId>us-west-1</RegionId> - <LocalName>ç¾å½ç¡ è°·</LocalName> + <LocalName></LocalName> </Region> </Regions> </DescribeRegionsResponse> http://git-wip-us.apache.org/repos/asf/libcloud/blob/25e2d161/libcloud/test/compute/fixtures/ecs/describe_zones.xml ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/ecs/describe_zones.xml b/libcloud/test/compute/fixtures/ecs/describe_zones.xml index a434836..a953553 100644 --- a/libcloud/test/compute/fixtures/ecs/describe_zones.xml +++ b/libcloud/test/compute/fixtures/ecs/describe_zones.xml @@ -31,7 +31,7 @@ <InstanceTypes>ecs.s1.medium</InstanceTypes> </AvailableInstanceTypes> <ZoneId>cn-qingdao-b</ZoneId> - <LocalName>éå²å¯ç¨åºB</LocalName> + <LocalName>B</LocalName> <AvailableDiskCategories> <DiskCategories>cloud_ssd</DiskCategories> <DiskCategories>ephemeral</DiskCategories> http://git-wip-us.apache.org/repos/asf/libcloud/blob/25e2d161/libcloud/test/compute/fixtures/ecs/pages_describe_images.xml ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/ecs/pages_describe_images.xml b/libcloud/test/compute/fixtures/ecs/pages_describe_images.xml index 76e8877..25f9cc3 100644 --- a/libcloud/test/compute/fixtures/ecs/pages_describe_images.xml +++ b/libcloud/test/compute/fixtures/ecs/pages_describe_images.xml @@ -12,7 +12,7 @@ <ProductCode></ProductCode> <OSType>linux</OSType> <Architecture>x86_64</Architecture> - <OSName>FreeBSD 10.1 64ä½</OSName> + <OSName>FreeBSD 10.1 64</OSName> <DiskDeviceMappings> <DiskDeviceMapping> <ImportOSSObject></ImportOSSObject> http://git-wip-us.apache.org/repos/asf/libcloud/blob/25e2d161/libcloud/test/compute/fixtures/ecs/pages_describe_images_page2.xml ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/ecs/pages_describe_images_page2.xml b/libcloud/test/compute/fixtures/ecs/pages_describe_images_page2.xml index 615e152..0208118 100644 --- a/libcloud/test/compute/fixtures/ecs/pages_describe_images_page2.xml +++ b/libcloud/test/compute/fixtures/ecs/pages_describe_images_page2.xml @@ -12,7 +12,7 @@ <ProductCode></ProductCode> <OSType>linux</OSType> <Architecture>x86_64</Architecture> - <OSName>FreeBSD 10.1 64ä½</OSName> + <OSName>FreeBSD 10.1 64</OSName> <DiskDeviceMappings> <DiskDeviceMapping> <ImportOSSObject></ImportOSSObject> http://git-wip-us.apache.org/repos/asf/libcloud/blob/25e2d161/libcloud/test/compute/test_ecs.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ecs.py b/libcloud/test/compute/test_ecs.py index 91e86af..cbd45fe 100644 --- a/libcloud/test/compute/test_ecs.py +++ b/libcloud/test/compute/test_ecs.py @@ -185,7 +185,6 @@ class ECSDriverTestCase(LibcloudTestCase): self.assertEqual(9, len(locations)) location = locations[0] self.assertEqual('ap-southeast-1', location.id) - self.assertEqual('äºå¤ªï¼æ°å å¡ï¼', location.name) self.assertIsNone(location.country) def test_create_node_without_sg_id_exception(self): @@ -428,7 +427,7 @@ class ECSDriverTestCase(LibcloudTestCase): 'description': 'freebsd1001_64_20G_aliaegis_20150527.vhd', 'size': 20, 'image_owner_alias': 'system', - 'os_name': 'FreeBSD 10.1 64ä½', + 'os_name': 'FreeBSD 10.1 64', 'product_code': '', 'is_subscribed': False, 'progress': '100%', @@ -552,7 +551,6 @@ class ECSDriverTestCase(LibcloudTestCase): self.assertEqual(1, len(zones)) zone = zones[0] self.assertEqual('cn-qingdao-b', zone.id) - self.assertEqual('éå²å¯ç¨åºB', zone.name) self.assertEqual(self.driver, zone.driver) self.assertIsNotNone(zone.available_resource_types) self.assertEqual('IoOptimized', zone.available_resource_types[0])
