DigitalOceanNodeDriver minor revisions - Raise on api_version / key or key-secret mismatch - Added tests for v1 and v2 DigitalOceanNodeDriver using wrong keys - Updated examples to include explicit api_version values - Cleaned up some whitespace lint - Cleaned up tests
Signed-off-by: Tomaz Muraus <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/fa667636 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/fa667636 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/fa667636 Branch: refs/heads/trunk Commit: fa667636ed0750c040501a3ff9fc7deac5f6ba94 Parents: 34bff99 Author: jcastillo2nd <[email protected]> Authored: Thu May 28 14:15:24 2015 +0000 Committer: Tomaz Muraus <[email protected]> Committed: Sun Jun 14 18:05:58 2015 +0800 ---------------------------------------------------------------------- libcloud/test/compute/test_digitalocean_v1.py | 2 +- libcloud/test/compute/test_digitalocean_v2.py | 2 +- libcloud/test/dns/test_digitalocean.py | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/fa667636/libcloud/test/compute/test_digitalocean_v1.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_digitalocean_v1.py b/libcloud/test/compute/test_digitalocean_v1.py index 0dd0e3c..668e56e 100644 --- a/libcloud/test/compute/test_digitalocean_v1.py +++ b/libcloud/test/compute/test_digitalocean_v1.py @@ -44,7 +44,7 @@ class DigitalOcean_v1_Tests(LibcloudTestCase): def test_v1_uses_v2_key(self): self.assertRaises(InvalidCredsError, DigitalOceanNodeDriver, - *DIGITALOCEAN_v2_PARAMS, api_version='v1') + *DIGITALOCEAN_v2_PARAMS, api_version='v1') def test_authentication(self): DigitalOceanMockHttp.type = 'UNAUTHORIZED_CLIENT' http://git-wip-us.apache.org/repos/asf/libcloud/blob/fa667636/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 73db2af..03a6425 100644 --- a/libcloud/test/compute/test_digitalocean_v2.py +++ b/libcloud/test/compute/test_digitalocean_v2.py @@ -43,7 +43,7 @@ class DigitalOcean_v2_Tests(LibcloudTestCase): def test_v2_uses_v1_key(self): self.assertRaises(InvalidCredsError, DigitalOceanNodeDriver, - *DIGITALOCEAN_v1_PARAMS, api_version='v2') + *DIGITALOCEAN_v1_PARAMS, api_version='v2') def test_authentication(self): DigitalOceanMockHttp.type = 'UNAUTHORIZED' http://git-wip-us.apache.org/repos/asf/libcloud/blob/fa667636/libcloud/test/dns/test_digitalocean.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_digitalocean.py b/libcloud/test/dns/test_digitalocean.py index 6a5f222..f1bb92e 100644 --- a/libcloud/test/dns/test_digitalocean.py +++ b/libcloud/test/dns/test_digitalocean.py @@ -15,13 +15,11 @@ import sys import unittest -from libcloud.common.types import InvalidCredsError from libcloud.dns.drivers.digitalocean import DigitalOceanDNSDriver from libcloud.dns.types import RecordType from libcloud.test import LibcloudTestCase, MockHttpTestCase from libcloud.test.file_fixtures import DNSFileFixtures from libcloud.test.secrets import DIGITALOCEAN_v2_PARAMS -from libcloud.test.secrets import DIGITALOCEAN_v1_PARAMS from libcloud.utils.py3 import httplib
