remove references to mockhttptestcase where it was just being used as a wrapper for mockhttp
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/31182a36 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/31182a36 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/31182a36 Branch: refs/heads/trunk Commit: 31182a366e8ec7a955786070e05fb60ce03b7fbc Parents: 312a08f Author: Anthony Shaw <anthonys...@apache.org> Authored: Tue Apr 11 14:48:43 2017 +1000 Committer: Anthony Shaw <anthonys...@apache.org> Committed: Tue Apr 11 14:48:43 2017 +1000 ---------------------------------------------------------------------- libcloud/test/common/test_cloudstack.py | 4 ++-- libcloud/test/common/test_digitalocean_v2.py | 4 ++-- libcloud/test/compute/test_abiquo.py | 4 ++-- libcloud/test/compute/test_cloudscale.py | 4 ++-- libcloud/test/compute/test_cloudsigma_v2_0.py | 4 ++-- libcloud/test/compute/test_cloudstack.py | 4 ++-- libcloud/test/compute/test_digitalocean_v2.py | 4 ++-- libcloud/test/compute/test_ec2.py | 4 ++-- libcloud/test/compute/test_ecs.py | 4 ++-- libcloud/test/compute/test_gce.py | 4 ++-- libcloud/test/compute/test_ktucloud.py | 4 ++-- libcloud/test/compute/test_onapp.py | 4 ++-- libcloud/test/compute/test_openstack.py | 6 +++--- libcloud/test/compute/test_vultr.py | 4 ++-- libcloud/test/dns/test_auroradns.py | 4 ++-- libcloud/test/dns/test_digitalocean.py | 4 ++-- libcloud/test/dns/test_durabledns.py | 4 ++-- libcloud/test/dns/test_google.py | 4 ++-- libcloud/test/loadbalancer/test_alb.py | 4 ++-- libcloud/test/loadbalancer/test_brightbox.py | 4 ++-- libcloud/test/loadbalancer/test_cloudstack.py | 4 ++-- libcloud/test/loadbalancer/test_elb.py | 4 ++-- libcloud/test/loadbalancer/test_gogrid.py | 4 ++-- libcloud/test/loadbalancer/test_rackspace.py | 6 +++--- libcloud/test/loadbalancer/test_slb.py | 4 ++-- libcloud/test/loadbalancer/test_softlayer.py | 4 ++-- libcloud/test/storage/test_backblaze_b2.py | 1 - libcloud/test/storage/test_cloudfiles.py | 1 - libcloud/test/storage/test_oss.py | 1 - libcloud/test/storage/test_s3.py | 1 - 30 files changed, 54 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/common/test_cloudstack.py ---------------------------------------------------------------------- diff --git a/libcloud/test/common/test_cloudstack.py b/libcloud/test/common/test_cloudstack.py index 89c50b7..28815e1 100644 --- a/libcloud/test/common/test_cloudstack.py +++ b/libcloud/test/common/test_cloudstack.py @@ -29,7 +29,7 @@ from libcloud.utils.py3 import parse_qsl from libcloud.common.cloudstack import CloudStackConnection from libcloud.common.types import MalformedResponseError -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp async_delay = 0 @@ -124,7 +124,7 @@ class CloudStackCommonTest(unittest.TestCase): self.assertEqual(connection._make_signature(params), b(case[1])) -class CloudStackMockHttp(MockHttpTestCase): +class CloudStackMockHttp(MockHttp): ERROR_TEXT = 'ERROR TEXT' http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/common/test_digitalocean_v2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/common/test_digitalocean_v2.py b/libcloud/test/common/test_digitalocean_v2.py index 21d855e..3b2db30 100644 --- a/libcloud/test/common/test_digitalocean_v2.py +++ b/libcloud/test/common/test_digitalocean_v2.py @@ -17,7 +17,7 @@ import unittest from libcloud.common.types import InvalidCredsError from libcloud.common.digitalocean import DigitalOceanBaseDriver -from libcloud.test import LibcloudTestCase, MockHttpTestCase +from libcloud.test import LibcloudTestCase, MockHttp from libcloud.test.file_fixtures import FileFixtures from libcloud.test.secrets import DIGITALOCEAN_v2_PARAMS from libcloud.utils.py3 import httplib @@ -60,7 +60,7 @@ class DigitalOceanTests(LibcloudTestCase): self.assertEqual(actions[0]['status'], 'completed') -class DigitalOceanMockHttp(MockHttpTestCase): +class DigitalOceanMockHttp(MockHttp): fixtures = FileFixtures('common', 'digitalocean') response = { http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/compute/test_abiquo.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_abiquo.py b/libcloud/test/compute/test_abiquo.py index 4bae089..d8a8560 100644 --- a/libcloud/test/compute/test_abiquo.py +++ b/libcloud/test/compute/test_abiquo.py @@ -30,7 +30,7 @@ from libcloud.common.abiquo import ForbiddenError, get_href from libcloud.common.types import InvalidCredsError, LibcloudError from libcloud.compute.base import NodeLocation, NodeImage from libcloud.test.compute import TestCaseMixin -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp from libcloud.test.file_fixtures import ComputeFileFixtures @@ -299,7 +299,7 @@ class AbiquoNodeDriverTest(unittest.TestCase, TestCaseMixin): self.assertEqual(href, '/admin/enterprises/1234') -class AbiquoMockHttp(MockHttpTestCase): +class AbiquoMockHttp(MockHttp): """ Mock the functionallity of the remote Abiquo API. http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/compute/test_cloudscale.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_cloudscale.py b/libcloud/test/compute/test_cloudscale.py index 2eb6b8e..1184807 100644 --- a/libcloud/test/compute/test_cloudscale.py +++ b/libcloud/test/compute/test_cloudscale.py @@ -24,7 +24,7 @@ from libcloud.utils.py3 import httplib from libcloud.compute.drivers.cloudscale import CloudscaleNodeDriver -from libcloud.test import LibcloudTestCase, MockHttpTestCase +from libcloud.test import LibcloudTestCase, MockHttp from libcloud.test.file_fixtures import ComputeFileFixtures from libcloud.test.secrets import CLOUDSCALE_PARAMS @@ -91,7 +91,7 @@ class CloudscaleTests(LibcloudTestCase): self.assertTrue(result) -class CloudscaleMockHttp(MockHttpTestCase): +class CloudscaleMockHttp(MockHttp): fixtures = ComputeFileFixtures('cloudscale') def _v1_images(self, method, url, body, headers): http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/compute/test_cloudsigma_v2_0.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_cloudsigma_v2_0.py b/libcloud/test/compute/test_cloudsigma_v2_0.py index 44bc1ce..307eedc 100644 --- a/libcloud/test/compute/test_cloudsigma_v2_0.py +++ b/libcloud/test/compute/test_cloudsigma_v2_0.py @@ -29,7 +29,7 @@ from libcloud.compute.drivers.cloudsigma import CloudSigmaError from libcloud.compute.types import NodeState from libcloud.test import unittest -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp from libcloud.test.file_fixtures import ComputeFileFixtures @@ -440,7 +440,7 @@ class CloudSigmaAPI20IndirectTestCase(CloudSigmaAPI20BaseTestCase, driver_kwargs = {'api_version': '2.0'} -class CloudSigmaMockHttp(MockHttpTestCase): +class CloudSigmaMockHttp(MockHttp): fixtures = ComputeFileFixtures('cloudsigma_2_0') def _api_2_0_servers_detail_INVALID_CREDS(self, method, url, body, headers): http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/compute/test_cloudstack.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_cloudstack.py b/libcloud/test/compute/test_cloudstack.py index 068f4f8..753ae90 100644 --- a/libcloud/test/compute/test_cloudstack.py +++ b/libcloud/test/compute/test_cloudstack.py @@ -35,7 +35,7 @@ from libcloud.compute.types import NodeState from libcloud.compute.providers import get_driver from libcloud.test import unittest -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp from libcloud.test.compute import TestCaseMixin from libcloud.test.file_fixtures import ComputeFileFixtures @@ -1266,7 +1266,7 @@ class CloudStackTestCase(CloudStackCommonTestCase, unittest.TestCase): self.fail('url provided but driver raised an exception') -class CloudStackMockHttp(MockHttpTestCase): +class CloudStackMockHttp(MockHttp): fixtures = ComputeFileFixtures('cloudstack') fixture_tag = 'default' http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/compute/test_digitalocean_v2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_digitalocean_v2.py b/libcloud/test/compute/test_digitalocean_v2.py index d9ec5f9..c15dbe7 100644 --- a/libcloud/test/compute/test_digitalocean_v2.py +++ b/libcloud/test/compute/test_digitalocean_v2.py @@ -30,7 +30,7 @@ from libcloud.common.digitalocean import DigitalOcean_v1_Error from libcloud.compute.base import NodeImage from libcloud.compute.drivers.digitalocean import DigitalOceanNodeDriver -from libcloud.test import LibcloudTestCase, MockHttpTestCase +from libcloud.test import LibcloudTestCase, MockHttp from libcloud.test.file_fixtures import ComputeFileFixtures from libcloud.test.secrets import DIGITALOCEAN_v1_PARAMS from libcloud.test.secrets import DIGITALOCEAN_v2_PARAMS @@ -273,7 +273,7 @@ class DigitalOcean_v2_Tests(LibcloudTestCase): self.assertTrue(result) -class DigitalOceanMockHttp(MockHttpTestCase): +class DigitalOceanMockHttp(MockHttp): fixtures = ComputeFileFixtures('digitalocean_v2') def _v2_regions(self, method, url, body, headers): http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index 4d34e47..c50cdba 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -35,7 +35,7 @@ from libcloud.compute.base import StorageVolume, VolumeSnapshot from libcloud.compute.types import KeyPairDoesNotExistError, StorageVolumeState, \ VolumeSnapshotState -from libcloud.test import MockHttpTestCase, LibcloudTestCase +from libcloud.test import MockHttp, LibcloudTestCase from libcloud.test.compute import TestCaseMixin from libcloud.test.file_fixtures import ComputeFileFixtures @@ -1253,7 +1253,7 @@ class EC2SAEastTests(EC2Tests): region = 'sa-east-1' -class EC2MockHttp(MockHttpTestCase): +class EC2MockHttp(MockHttp): fixtures = ComputeFileFixtures('ec2') def _DescribeInstances(self, method, url, body, headers): http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/compute/test_ecs.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ecs.py b/libcloud/test/compute/test_ecs.py index dc3a615..91e86af 100644 --- a/libcloud/test/compute/test_ecs.py +++ b/libcloud/test/compute/test_ecs.py @@ -23,7 +23,7 @@ from libcloud.compute.base import Node, NodeAuthPassword, NodeImage, \ NodeLocation, NodeSize, StorageVolume, VolumeSnapshot from libcloud.compute.drivers.ecs import ECSDriver from libcloud.compute.types import NodeState, StorageVolumeState -from libcloud.test import MockHttpTestCase, LibcloudTestCase +from libcloud.test import MockHttp, LibcloudTestCase from libcloud.test.file_fixtures import ComputeFileFixtures from libcloud.test.secrets import ECS_PARAMS from libcloud.utils.py3 import httplib @@ -562,7 +562,7 @@ class ECSDriverTestCase(LibcloudTestCase): self.assertEqual('cloud_ssd', zone.available_disk_categories[0]) -class ECSMockHttp(MockHttpTestCase): +class ECSMockHttp(MockHttp): fixtures = ComputeFileFixtures('ecs') def _DescribeInstances(self, method, url, body, headers): http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/compute/test_gce.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_gce.py b/libcloud/test/compute/test_gce.py index 72621d1..d3ecb85 100644 --- a/libcloud/test/compute/test_gce.py +++ b/libcloud/test/compute/test_gce.py @@ -32,7 +32,7 @@ from libcloud.common.google import (GoogleBaseAuthConnection, from libcloud.test.common.test_google import GoogleAuthMockHttp, GoogleTestCase from libcloud.compute.base import Node, StorageVolume -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp from libcloud.test.compute import TestCaseMixin from libcloud.test.file_fixtures import ComputeFileFixtures @@ -1942,7 +1942,7 @@ class GCENodeDriverTest(GoogleTestCase, TestCaseMixin): self.assertEqual(zone_no_mw.time_until_mw, None) -class GCEMockHttp(MockHttpTestCase): +class GCEMockHttp(MockHttp): fixtures = ComputeFileFixtures('gce') json_hdr = {'content-type': 'application/json; charset=UTF-8'} http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/compute/test_ktucloud.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ktucloud.py b/libcloud/test/compute/test_ktucloud.py index 9bb255e..87c2967 100644 --- a/libcloud/test/compute/test_ktucloud.py +++ b/libcloud/test/compute/test_ktucloud.py @@ -27,7 +27,7 @@ except ImportError: from libcloud.compute.drivers.ktucloud import KTUCloudNodeDriver -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp from libcloud.test.compute import TestCaseMixin from libcloud.test.file_fixtures import ComputeFileFixtures @@ -90,7 +90,7 @@ class KTUCloudNodeDriverTest(unittest.TestCase, TestCaseMixin): self.assertTrue(check) -class KTUCloudStackMockHttp(MockHttpTestCase): +class KTUCloudStackMockHttp(MockHttp): fixtures = ComputeFileFixtures('ktucloud') fixture_tag = 'default' http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/compute/test_onapp.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_onapp.py b/libcloud/test/compute/test_onapp.py index c5d1641..33dbbb7 100644 --- a/libcloud/test/compute/test_onapp.py +++ b/libcloud/test/compute/test_onapp.py @@ -3,7 +3,7 @@ import sys from libcloud.compute.base import Node from libcloud.compute.drivers.onapp import OnAppNodeDriver -from libcloud.test import MockHttpTestCase, LibcloudTestCase +from libcloud.test import MockHttp, LibcloudTestCase from libcloud.test.secrets import ONAPP_PARAMS from libcloud.test.file_fixtures import ComputeFileFixtures from libcloud.utils.py3 import httplib @@ -108,7 +108,7 @@ class OnAppNodeTestCase(LibcloudTestCase): self.assertTrue(response) -class OnAppMockHttp(MockHttpTestCase): +class OnAppMockHttp(MockHttp): fixtures = ComputeFileFixtures('onapp') def _virtual_machines_json(self, method, url, body, headers): http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/compute/test_openstack.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_openstack.py b/libcloud/test/compute/test_openstack.py index ea85ca8..54737aa 100644 --- a/libcloud/test/compute/test_openstack.py +++ b/libcloud/test/compute/test_openstack.py @@ -47,7 +47,7 @@ from libcloud.compute.base import Node, NodeImage, NodeSize from libcloud.pricing import set_pricing, clear_pricing_data from libcloud.common.base import Response -from libcloud.test import MockHttpTestCase, XML_HEADERS +from libcloud.test import MockHttp, XML_HEADERS from libcloud.test.file_fixtures import ComputeFileFixtures, OpenStackFixtures from libcloud.test.compute import TestCaseMixin @@ -460,7 +460,7 @@ class OpenStack_1_0_FactoryMethodTests(OpenStack_1_0_Tests): self.fail('Exception was not thrown') -class OpenStackMockHttp(MockHttpTestCase): +class OpenStackMockHttp(MockHttp): fixtures = ComputeFileFixtures('openstack') auth_fixtures = OpenStackFixtures() json_content_headers = {'content-type': 'application/json; charset=UTF-8'} @@ -1564,7 +1564,7 @@ class OpenStack_1_1_FactoryMethodTests(OpenStack_1_1_Tests): driver_kwargs = {'ex_force_auth_version': '2.0'} -class OpenStack_1_1_MockHttp(MockHttpTestCase): +class OpenStack_1_1_MockHttp(MockHttp): fixtures = ComputeFileFixtures('openstack_v1.1') auth_fixtures = OpenStackFixtures() json_content_headers = {'content-type': 'application/json; charset=UTF-8'} http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/compute/test_vultr.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_vultr.py b/libcloud/test/compute/test_vultr.py index 992c655..afa4fdb 100644 --- a/libcloud/test/compute/test_vultr.py +++ b/libcloud/test/compute/test_vultr.py @@ -24,7 +24,7 @@ from libcloud.utils.py3 import httplib from libcloud.compute.drivers.vultr import VultrNodeDriver -from libcloud.test import LibcloudTestCase, MockHttpTestCase +from libcloud.test import LibcloudTestCase, MockHttp from libcloud.test.file_fixtures import ComputeFileFixtures from libcloud.test.secrets import VULTR_PARAMS @@ -109,7 +109,7 @@ class VultrTests(LibcloudTestCase): self.assertTrue(res) -class VultrMockHttp(MockHttpTestCase): +class VultrMockHttp(MockHttp): fixtures = ComputeFileFixtures('vultr') def _v1_regions_list(self, method, url, body, headers): http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/dns/test_auroradns.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_auroradns.py b/libcloud/test/dns/test_auroradns.py index af12518..44cbf61 100644 --- a/libcloud/test/dns/test_auroradns.py +++ b/libcloud/test/dns/test_auroradns.py @@ -23,7 +23,7 @@ from libcloud.dns.types import ZoneAlreadyExistsError from libcloud.dns.types import RecordDoesNotExistError from libcloud.dns.base import Zone from libcloud.test import LibcloudTestCase -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp from libcloud.test import unittest from libcloud.test.file_fixtures import DNSFileFixtures from libcloud.test.secrets import DNS_PARAMS_AURORADNS @@ -248,7 +248,7 @@ class AuroraDNSDriverTests(LibcloudTestCase): self.assertEqual(check.type, AuroraDNSHealthCheckType.HTTP) -class AuroraDNSDriverMockHttp(MockHttpTestCase): +class AuroraDNSDriverMockHttp(MockHttp): fixtures = DNSFileFixtures('auroradns') def _zones(self, method, url, body, headers): http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/dns/test_digitalocean.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_digitalocean.py b/libcloud/test/dns/test_digitalocean.py index 33d0cb9..d8235b4 100644 --- a/libcloud/test/dns/test_digitalocean.py +++ b/libcloud/test/dns/test_digitalocean.py @@ -17,7 +17,7 @@ import unittest from libcloud.dns.drivers.digitalocean import DigitalOceanDNSDriver from libcloud.dns.types import RecordType -from libcloud.test import LibcloudTestCase, MockHttpTestCase +from libcloud.test import LibcloudTestCase, MockHttp from libcloud.test.file_fixtures import DNSFileFixtures from libcloud.test.secrets import DIGITALOCEAN_v2_PARAMS from libcloud.utils.py3 import httplib @@ -93,7 +93,7 @@ class DigitalOceanDNSTests(LibcloudTestCase): self.assertTrue(self.driver.delete_record(record)) -class DigitalOceanDNSMockHttp(MockHttpTestCase): +class DigitalOceanDNSMockHttp(MockHttp): fixtures = DNSFileFixtures('digitalocean') response_map = { http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/dns/test_durabledns.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_durabledns.py b/libcloud/test/dns/test_durabledns.py index 5c0b041..23f57bb 100644 --- a/libcloud/test/dns/test_durabledns.py +++ b/libcloud/test/dns/test_durabledns.py @@ -21,7 +21,7 @@ from libcloud.dns.base import Record, Zone from libcloud.dns.types import RecordType from libcloud.dns.types import ZoneDoesNotExistError, ZoneAlreadyExistsError from libcloud.dns.types import RecordDoesNotExistError -from libcloud.test import LibcloudTestCase, MockHttpTestCase +from libcloud.test import LibcloudTestCase, MockHttp from libcloud.test.file_fixtures import DNSFileFixtures from libcloud.test.secrets import DNS_PARAMS_DURABLEDNS from libcloud.utils.py3 import httplib @@ -431,7 +431,7 @@ class DurableDNSTests(LibcloudTestCase): self.fail('Exception was not thrown') -class DurableDNSMockHttp(MockHttpTestCase): +class DurableDNSMockHttp(MockHttp): fixtures = DNSFileFixtures('durabledns') def _services_dns_listZones_php(self, method, url, body, headers): http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/dns/test_google.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_google.py b/libcloud/test/dns/test_google.py index ebc2c0f..6559924 100644 --- a/libcloud/test/dns/test_google.py +++ b/libcloud/test/dns/test_google.py @@ -23,7 +23,7 @@ from libcloud.dns.drivers.google import GoogleDNSDriver from libcloud.common.google import GoogleBaseAuthConnection from libcloud.test.common.test_google import GoogleAuthMockHttp, GoogleTestCase -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp from libcloud.test.file_fixtures import DNSFileFixtures from libcloud.test.secrets import DNS_PARAMS_GOOGLE, DNS_KEYWORD_PARAMS_GOOGLE @@ -120,7 +120,7 @@ class GoogleTests(GoogleTestCase): self.assertEqual(records['deletions'][0].type, 'A') -class GoogleDNSMockHttp(MockHttpTestCase): +class GoogleDNSMockHttp(MockHttp): fixtures = DNSFileFixtures('google') def _dns_v1_projects_project_name_managedZones( http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/loadbalancer/test_alb.py ---------------------------------------------------------------------- diff --git a/libcloud/test/loadbalancer/test_alb.py b/libcloud/test/loadbalancer/test_alb.py index 01813eb..a391709 100644 --- a/libcloud/test/loadbalancer/test_alb.py +++ b/libcloud/test/loadbalancer/test_alb.py @@ -20,7 +20,7 @@ from libcloud.utils.py3 import httplib from libcloud.loadbalancer.drivers.alb import ApplicationLBDriver from libcloud.loadbalancer.types import State -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp from libcloud.test.secrets import LB_ALB_PARAMS from libcloud.test.file_fixtures import LoadBalancerFileFixtures @@ -127,7 +127,7 @@ class ApplicationLBTests(unittest.TestCase): self.assertTrue(('conditions' in listener_rules[0]), 'Rule is missing "conditions" field') -class ApplicationLBMockHttp(MockHttpTestCase): +class ApplicationLBMockHttp(MockHttp): fixtures = LoadBalancerFileFixtures('alb') def _2015_12_01_DescribeLoadBalancers(self, method, url, body, headers): http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/loadbalancer/test_brightbox.py ---------------------------------------------------------------------- diff --git a/libcloud/test/loadbalancer/test_brightbox.py b/libcloud/test/loadbalancer/test_brightbox.py index 7c1008d..93594b0 100644 --- a/libcloud/test/loadbalancer/test_brightbox.py +++ b/libcloud/test/loadbalancer/test_brightbox.py @@ -21,7 +21,7 @@ from libcloud.loadbalancer.base import Member, Algorithm from libcloud.loadbalancer.drivers.brightbox import BrightboxLBDriver from libcloud.loadbalancer.types import State -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp from libcloud.test.secrets import LB_BRIGHTBOX_PARAMS from libcloud.test.file_fixtures import LoadBalancerFileFixtures @@ -92,7 +92,7 @@ class BrightboxLBTests(unittest.TestCase): self.assertTrue(balancer.detach_member(member)) -class BrightboxLBMockHttp(MockHttpTestCase): +class BrightboxLBMockHttp(MockHttp): fixtures = LoadBalancerFileFixtures('brightbox') def _token(self, method, url, body, headers): http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/loadbalancer/test_cloudstack.py ---------------------------------------------------------------------- diff --git a/libcloud/test/loadbalancer/test_cloudstack.py b/libcloud/test/loadbalancer/test_cloudstack.py index 11e0b00..e70110e 100644 --- a/libcloud/test/loadbalancer/test_cloudstack.py +++ b/libcloud/test/loadbalancer/test_cloudstack.py @@ -15,7 +15,7 @@ from libcloud.loadbalancer.base import LoadBalancer, Member, Algorithm from libcloud.loadbalancer.drivers.cloudstack import CloudStackLBDriver from libcloud.test import unittest -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp from libcloud.test.file_fixtures import LoadBalancerFileFixtures @@ -86,7 +86,7 @@ class CloudStackLBTests(unittest.TestCase): self.assertEqual(member.balancer, balancer) -class CloudStackMockHttp(MockHttpTestCase): +class CloudStackMockHttp(MockHttp): fixtures = LoadBalancerFileFixtures('cloudstack') fixture_tag = 'default' http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/loadbalancer/test_elb.py ---------------------------------------------------------------------- diff --git a/libcloud/test/loadbalancer/test_elb.py b/libcloud/test/loadbalancer/test_elb.py index 29ce2b7..e58676c 100644 --- a/libcloud/test/loadbalancer/test_elb.py +++ b/libcloud/test/loadbalancer/test_elb.py @@ -21,7 +21,7 @@ from libcloud.loadbalancer.base import Member, Algorithm from libcloud.loadbalancer.drivers.elb import ElasticLBDriver from libcloud.loadbalancer.types import State -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp from libcloud.test.secrets import LB_ELB_PARAMS from libcloud.test.file_fixtures import LoadBalancerFileFixtures @@ -177,7 +177,7 @@ class ElasticLBTests(unittest.TestCase): listeners=[[1024, 65533, 'HTTP']])) -class ElasticLBMockHttp(MockHttpTestCase): +class ElasticLBMockHttp(MockHttp): fixtures = LoadBalancerFileFixtures('elb') def _2012_06_01_DescribeLoadBalancers(self, method, url, body, headers): http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/loadbalancer/test_gogrid.py ---------------------------------------------------------------------- diff --git a/libcloud/test/loadbalancer/test_gogrid.py b/libcloud/test/loadbalancer/test_gogrid.py index 53ce120..4d70a02 100644 --- a/libcloud/test/loadbalancer/test_gogrid.py +++ b/libcloud/test/loadbalancer/test_gogrid.py @@ -25,7 +25,7 @@ from libcloud.compute.drivers.dummy import DummyNodeDriver from libcloud.loadbalancer.base import LoadBalancer, Member, Algorithm from libcloud.loadbalancer.drivers.gogrid import GoGridLBDriver -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp from libcloud.test.file_fixtures import LoadBalancerFileFixtures @@ -154,7 +154,7 @@ class GoGridTests(unittest.TestCase): self.assertTrue(ret2) -class GoGridLBMockHttp(MockHttpTestCase): +class GoGridLBMockHttp(MockHttp): fixtures = LoadBalancerFileFixtures('gogrid') def _api_grid_loadbalancer_list(self, method, url, body, headers): http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/loadbalancer/test_rackspace.py ---------------------------------------------------------------------- diff --git a/libcloud/test/loadbalancer/test_rackspace.py b/libcloud/test/loadbalancer/test_rackspace.py index 112d825..07ae408 100644 --- a/libcloud/test/loadbalancer/test_rackspace.py +++ b/libcloud/test/loadbalancer/test_rackspace.py @@ -33,7 +33,7 @@ from libcloud.loadbalancer.drivers.rackspace import RackspaceAccessRuleType from libcloud.common.types import LibcloudError from libcloud.test import unittest -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp from libcloud.test.file_fixtures import LoadBalancerFileFixtures from libcloud.test.file_fixtures import OpenStackFixtures @@ -923,7 +923,7 @@ class RackspaceUKLBTests(RackspaceLBTests): self.driver.connection._populate_hosts_and_request_paths() -class RackspaceLBMockHttp(MockHttpTestCase): +class RackspaceLBMockHttp(MockHttp): fixtures = LoadBalancerFileFixtures('rackspace') auth_fixtures = OpenStackFixtures() @@ -1480,7 +1480,7 @@ class RackspaceLBMockHttp(MockHttpTestCase): raise NotImplementedError -class RackspaceLBWithVIPMockHttp(MockHttpTestCase): +class RackspaceLBWithVIPMockHttp(MockHttp): fixtures = LoadBalancerFileFixtures('rackspace') auth_fixtures = OpenStackFixtures() http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/loadbalancer/test_slb.py ---------------------------------------------------------------------- diff --git a/libcloud/test/loadbalancer/test_slb.py b/libcloud/test/loadbalancer/test_slb.py index e7d7546..7743361 100644 --- a/libcloud/test/loadbalancer/test_slb.py +++ b/libcloud/test/loadbalancer/test_slb.py @@ -24,7 +24,7 @@ from libcloud.loadbalancer.drivers.slb import SLBDriver, \ SLBLoadBalancerTcpListener, SLBLoadBalancerUdpListener from libcloud.loadbalancer.types import State from libcloud.test.file_fixtures import LoadBalancerFileFixtures -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp from libcloud.test.secrets import LB_SLB_PARAMS from libcloud.utils.py3 import httplib @@ -272,7 +272,7 @@ class SLBDriverTestCases(unittest.TestCase): self.cert_name)) -class SLBMockHttp(MockHttpTestCase): +class SLBMockHttp(MockHttp): fixtures = LoadBalancerFileFixtures('slb') def _DescribeLoadBalancers(self, method, url, body, headers): http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/loadbalancer/test_softlayer.py ---------------------------------------------------------------------- diff --git a/libcloud/test/loadbalancer/test_softlayer.py b/libcloud/test/loadbalancer/test_softlayer.py index ea19e79..5c3a701 100644 --- a/libcloud/test/loadbalancer/test_softlayer.py +++ b/libcloud/test/loadbalancer/test_softlayer.py @@ -24,7 +24,7 @@ from libcloud.loadbalancer.base import Member, Algorithm from libcloud.loadbalancer.drivers.softlayer import SoftlayerLBDriver from libcloud.loadbalancer.types import State -from libcloud.test import MockHttpTestCase +from libcloud.test import MockHttp from libcloud.test.secrets import SOFTLAYER_PARAMS from libcloud.test.file_fixtures import LoadBalancerFileFixtures @@ -108,7 +108,7 @@ class SoftlayerLBTests(unittest.TestCase): lb_package, NodeLocation('dal05', None, None, None))) -class SoftLayerMockHttp(MockHttpTestCase): +class SoftLayerMockHttp(MockHttp): fixtures = LoadBalancerFileFixtures('softlayer') def _get_method_name(self, type, use_param, qs, path): http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/storage/test_backblaze_b2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/storage/test_backblaze_b2.py b/libcloud/test/storage/test_backblaze_b2.py index 074bd67..2743798 100644 --- a/libcloud/test/storage/test_backblaze_b2.py +++ b/libcloud/test/storage/test_backblaze_b2.py @@ -23,7 +23,6 @@ from libcloud.storage.drivers.backblaze_b2 import BackblazeB2StorageDriver from libcloud.utils.py3 import httplib from libcloud.test import unittest from libcloud.test import MockHttp -from libcloud.test import MockHttpTestCase from libcloud.test.file_fixtures import StorageFileFixtures http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/storage/test_cloudfiles.py ---------------------------------------------------------------------- diff --git a/libcloud/test/storage/test_cloudfiles.py b/libcloud/test/storage/test_cloudfiles.py index 9376dc1..5e6e85b 100644 --- a/libcloud/test/storage/test_cloudfiles.py +++ b/libcloud/test/storage/test_cloudfiles.py @@ -40,7 +40,6 @@ from libcloud.storage.types import InvalidContainerNameError from libcloud.storage.drivers.cloudfiles import CloudFilesStorageDriver from libcloud.test import MockHttp # pylint: disable-msg=E0611 -from libcloud.test import MockHttpTestCase # pylint: disable-msg=E0611 from libcloud.test import unittest, generate_random_data from libcloud.test.file_fixtures import StorageFileFixtures # pylint: disable-msg=E0611 http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/storage/test_oss.py ---------------------------------------------------------------------- diff --git a/libcloud/test/storage/test_oss.py b/libcloud/test/storage/test_oss.py index 912a794..e20c3cb 100644 --- a/libcloud/test/storage/test_oss.py +++ b/libcloud/test/storage/test_oss.py @@ -48,7 +48,6 @@ from libcloud.storage.drivers.oss import OSSStorageDriver from libcloud.storage.drivers.oss import CHUNK_SIZE from libcloud.storage.drivers.dummy import DummyIterator from libcloud.test import MockHttp, generate_random_data # pylint: disable-msg=E0611 -from libcloud.test import MockHttpTestCase # pylint: disable-msg=E0611 from libcloud.test.file_fixtures import StorageFileFixtures # pylint: disable-msg=E0611 from libcloud.test.secrets import STORAGE_OSS_PARAMS http://git-wip-us.apache.org/repos/asf/libcloud/blob/31182a36/libcloud/test/storage/test_s3.py ---------------------------------------------------------------------- diff --git a/libcloud/test/storage/test_s3.py b/libcloud/test/storage/test_s3.py index 50fcecb..3b8cef3 100644 --- a/libcloud/test/storage/test_s3.py +++ b/libcloud/test/storage/test_s3.py @@ -49,7 +49,6 @@ from libcloud.storage.drivers.s3 import CHUNK_SIZE from libcloud.utils.py3 import b from libcloud.test import MockHttp # pylint: disable-msg=E0611 -from libcloud.test import MockHttpTestCase # pylint: disable-msg=E0611 from libcloud.test import unittest, make_response, generate_random_data from libcloud.test.file_fixtures import StorageFileFixtures # pylint: disable-msg=E0611 from libcloud.test.secrets import STORAGE_S3_PARAMS
