Author: tomaz
Date: Sat Jun 30 04:14:28 2012
New Revision: 1355632
URL: http://svn.apache.org/viewvc?rev=1355632&view=rev
Log:
Move tests from test/ to libcloud/test/.
Added:
libcloud/trunk/libcloud/test/
- copied from r1355631, libcloud/trunk/test/
Removed:
libcloud/trunk/test/
Modified:
libcloud/trunk/libcloud/test/common/test_cloudstack.py
libcloud/trunk/libcloud/test/compute/test_base.py
libcloud/trunk/libcloud/test/compute/test_bluebox.py
libcloud/trunk/libcloud/test/compute/test_brightbox.py
libcloud/trunk/libcloud/test/compute/test_cloudsigma.py
libcloud/trunk/libcloud/test/compute/test_cloudstack.py
libcloud/trunk/libcloud/test/compute/test_deployment.py
libcloud/trunk/libcloud/test/compute/test_dreamhost.py
libcloud/trunk/libcloud/test/compute/test_ec2.py
libcloud/trunk/libcloud/test/compute/test_ecp.py
libcloud/trunk/libcloud/test/compute/test_elasticstack.py
libcloud/trunk/libcloud/test/compute/test_gandi.py
libcloud/trunk/libcloud/test/compute/test_gogrid.py
libcloud/trunk/libcloud/test/compute/test_ibm_sce.py
libcloud/trunk/libcloud/test/compute/test_joyent.py
libcloud/trunk/libcloud/test/compute/test_ktucloud.py
libcloud/trunk/libcloud/test/compute/test_linode.py
libcloud/trunk/libcloud/test/compute/test_opennebula.py
libcloud/trunk/libcloud/test/compute/test_openstack.py
libcloud/trunk/libcloud/test/compute/test_opsource.py
libcloud/trunk/libcloud/test/compute/test_rackspace.py
libcloud/trunk/libcloud/test/compute/test_rackspacenova.py
libcloud/trunk/libcloud/test/compute/test_rimuhosting.py
libcloud/trunk/libcloud/test/compute/test_slicehost.py
libcloud/trunk/libcloud/test/compute/test_softlayer.py
libcloud/trunk/libcloud/test/compute/test_vcl.py
libcloud/trunk/libcloud/test/compute/test_vcloud.py
libcloud/trunk/libcloud/test/compute/test_voxel.py
libcloud/trunk/libcloud/test/compute/test_vpsnet.py
libcloud/trunk/libcloud/test/dns/test_linode.py
libcloud/trunk/libcloud/test/dns/test_rackspace.py
libcloud/trunk/libcloud/test/dns/test_zerigo.py
libcloud/trunk/libcloud/test/loadbalancer/test_brightbox.py
libcloud/trunk/libcloud/test/loadbalancer/test_cloudstack.py
libcloud/trunk/libcloud/test/loadbalancer/test_gogrid.py
libcloud/trunk/libcloud/test/loadbalancer/test_rackspace.py
libcloud/trunk/libcloud/test/storage/test_atmos.py
libcloud/trunk/libcloud/test/storage/test_base.py
libcloud/trunk/libcloud/test/storage/test_cloudfiles.py
libcloud/trunk/libcloud/test/storage/test_google_storage.py
libcloud/trunk/libcloud/test/storage/test_s3.py
libcloud/trunk/libcloud/test/test_file_fixtures.py
libcloud/trunk/setup.py
Modified: libcloud/trunk/libcloud/test/common/test_cloudstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/common/test_cloudstack.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/common/test_cloudstack.py (original)
+++ libcloud/trunk/libcloud/test/common/test_cloudstack.py Sat Jun 30 04:14:28
2012
@@ -19,7 +19,7 @@ except AttributeError:
from libcloud.common.cloudstack import CloudStackConnection, CloudStackResponse
from libcloud.common.types import MalformedResponseError
-from test import MockHttpTestCase
+from libcloud.test import MockHttpTestCase
async_delay = 0
Modified: libcloud/trunk/libcloud/test/compute/test_base.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_base.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_base.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_base.py Sat Jun 30 04:14:28 2012
@@ -19,7 +19,7 @@ from libcloud.common.base import Respons
from libcloud.common.base import Connection, ConnectionKey,
ConnectionUserAndKey
from libcloud.compute.base import Node, NodeSize, NodeImage, NodeDriver
-from test import MockResponse # pylint: disable-msg=E0611
+from libcloud.test import MockResponse # pylint: disable-msg=E0611
class FakeDriver(object):
type = 0
Modified: libcloud/trunk/libcloud/test/compute/test_bluebox.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_bluebox.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_bluebox.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_bluebox.py Sat Jun 30 04:14:28
2012
@@ -21,9 +21,9 @@ from libcloud.compute.base import Node,
from libcloud.compute.types import NodeState
-from test import MockHttp
-from test.file_fixtures import ComputeFileFixtures
-from test.secrets import BLUEBOX_PARAMS
+from libcloud.test import MockHttp
+from libcloud.test.file_fixtures import ComputeFileFixtures
+from libcloud.test.secrets import BLUEBOX_PARAMS
class BlueboxTest(unittest.TestCase):
Modified: libcloud/trunk/libcloud/test/compute/test_brightbox.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_brightbox.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_brightbox.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_brightbox.py Sat Jun 30 04:14:28
2012
@@ -29,10 +29,10 @@ from libcloud.common.types import Invali
from libcloud.compute.drivers.brightbox import BrightboxNodeDriver
from libcloud.compute.types import NodeState
-from test import MockHttp
-from test.compute import TestCaseMixin
-from test.file_fixtures import ComputeFileFixtures
-from test.secrets import BRIGHTBOX_PARAMS
+from libcloud.test import MockHttp
+from libcloud.test.compute import TestCaseMixin
+from libcloud.test.file_fixtures import ComputeFileFixtures
+from libcloud.test.secrets import BRIGHTBOX_PARAMS
USER_DATA = '#!/bin/sh\ntest_script.sh\n'
Modified: libcloud/trunk/libcloud/test/compute/test_cloudsigma.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_cloudsigma.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_cloudsigma.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_cloudsigma.py Sat Jun 30 04:14:28
2012
@@ -21,9 +21,9 @@ from libcloud.compute.base import Node
from libcloud.compute.drivers.cloudsigma import CloudSigmaZrhNodeDriver
from libcloud.utils.misc import str2dicts, str2list, dict2str
-from test import MockHttp # pylint: disable-msg=E0611
-from test.compute import TestCaseMixin # pylint: disable-msg=E0611
-from test.file_fixtures import ComputeFileFixtures # pylint: disable-msg=E0611
+from libcloud.test import MockHttp # pylint: disable-msg=E0611
+from libcloud.test.compute import TestCaseMixin # pylint: disable-msg=E0611
+from libcloud.test.file_fixtures import ComputeFileFixtures # pylint:
disable-msg=E0611
class CloudSigmaTestCase(unittest.TestCase, TestCaseMixin):
Modified: libcloud/trunk/libcloud/test/compute/test_cloudstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_cloudstack.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_cloudstack.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_cloudstack.py Sat Jun 30 04:14:28
2012
@@ -18,9 +18,9 @@ except AttributeError:
from libcloud.compute.drivers.cloudstack import CloudStackNodeDriver
from libcloud.compute.types import DeploymentError, LibcloudError
-from test import MockHttpTestCase
-from test.compute import TestCaseMixin
-from test.file_fixtures import ComputeFileFixtures
+from libcloud.test import MockHttpTestCase
+from libcloud.test.compute import TestCaseMixin
+from libcloud.test.file_fixtures import ComputeFileFixtures
class CloudStackNodeDriverTest(unittest.TestCase, TestCaseMixin):
def setUp(self):
Modified: libcloud/trunk/libcloud/test/compute/test_deployment.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_deployment.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_deployment.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_deployment.py Sat Jun 30 04:14:28
2012
@@ -30,11 +30,11 @@ from libcloud.compute.types import NodeS
from libcloud.compute.ssh import BaseSSHClient
from libcloud.compute.drivers.rackspace import RackspaceNodeDriver as Rackspace
-from test import MockHttp, XML_HEADERS
-from test.file_fixtures import ComputeFileFixtures, OpenStackFixtures
+from libcloud.test import MockHttp, XML_HEADERS
+from libcloud.test.file_fixtures import ComputeFileFixtures, OpenStackFixtures
from mock import Mock, patch
-from test.secrets import RACKSPACE_PARAMS
+from libcloud.test.secrets import RACKSPACE_PARAMS
class MockDeployment(Deployment):
Modified: libcloud/trunk/libcloud/test/compute/test_dreamhost.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_dreamhost.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_dreamhost.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_dreamhost.py Sat Jun 30 04:14:28
2012
@@ -25,9 +25,9 @@ from libcloud.common.types import Invali
from libcloud.compute.drivers.dreamhost import DreamhostNodeDriver
from libcloud.compute.types import NodeState
-from test import MockHttp
-from test.compute import TestCaseMixin
-from test.secrets import DREAMHOST_PARAMS
+from libcloud.test import MockHttp
+from libcloud.test.compute import TestCaseMixin
+from libcloud.test.secrets import DREAMHOST_PARAMS
class DreamhostTest(unittest.TestCase, TestCaseMixin):
Modified: libcloud/trunk/libcloud/test/compute/test_ec2.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_ec2.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_ec2.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_ec2.py Sat Jun 30 04:14:28 2012
@@ -24,11 +24,11 @@ from libcloud.compute.drivers.ec2 import
from libcloud.compute.base import Node, NodeImage, NodeSize, NodeLocation
from libcloud.compute.base import StorageVolume
-from test import MockHttp, LibcloudTestCase
-from test.compute import TestCaseMixin
-from test.file_fixtures import ComputeFileFixtures
+from libcloud.test import MockHttp, LibcloudTestCase
+from libcloud.test.compute import TestCaseMixin
+from libcloud.test.file_fixtures import ComputeFileFixtures
-from test.secrets import EC2_PARAMS
+from libcloud.test.secrets import EC2_PARAMS
class EC2Tests(LibcloudTestCase, TestCaseMixin):
Modified: libcloud/trunk/libcloud/test/compute/test_ecp.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_ecp.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_ecp.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_ecp.py Sat Jun 30 04:14:28 2012
@@ -19,11 +19,11 @@ from libcloud.utils.py3 import httplib
from libcloud.compute.drivers.ecp import ECPNodeDriver
from libcloud.compute.types import NodeState
-from test import MockHttp
-from test.compute import TestCaseMixin
-from test.file_fixtures import ComputeFileFixtures
+from libcloud.test import MockHttp
+from libcloud.test.compute import TestCaseMixin
+from libcloud.test.file_fixtures import ComputeFileFixtures
-from test.secrets import ECP_PARAMS
+from libcloud.test.secrets import ECP_PARAMS
class ECPTests(unittest.TestCase, TestCaseMixin):
Modified: libcloud/trunk/libcloud/test/compute/test_elasticstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_elasticstack.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_elasticstack.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_elasticstack.py Sat Jun 30
04:14:28 2012
@@ -30,8 +30,8 @@ from libcloud.compute.drivers.serverlove
(ServerLoveNodeDriver as ServerLove)
from libcloud.common.types import InvalidCredsError, MalformedResponseError
-from test import MockHttp
-from test.file_fixtures import ComputeFileFixtures
+from libcloud.test import MockHttp
+from libcloud.test.file_fixtures import ComputeFileFixtures
class ElasticStackTestCase(object):
Modified: libcloud/trunk/libcloud/test/compute/test_gandi.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_gandi.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_gandi.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_gandi.py Sat Jun 30 04:14:28 2012
@@ -26,9 +26,9 @@ from libcloud.common.gandi import GandiE
from libcloud.compute.types import NodeState
from xml.etree import ElementTree as ET
-from test import MockHttp
-from test.file_fixtures import ComputeFileFixtures
-from test.secrets import GANDI_PARAMS
+from libcloud.test import MockHttp
+from libcloud.test.file_fixtures import ComputeFileFixtures
+from libcloud.test.secrets import GANDI_PARAMS
class MockGandiTransport(xmlrpclib.Transport):
Modified: libcloud/trunk/libcloud/test/compute/test_gogrid.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_gogrid.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_gogrid.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_gogrid.py Sat Jun 30 04:14:28 2012
@@ -24,9 +24,9 @@ from libcloud.common.gogrid import GoGri
from libcloud.compute.drivers.gogrid import GoGridNodeDriver
from libcloud.compute.base import Node, NodeImage, NodeSize
-from test import MockHttp # pylint: disable-msg=E0611
-from test.compute import TestCaseMixin # pylint: disable-msg=E0611
-from test.file_fixtures import ComputeFileFixtures # pylint: disable-msg=E0611
+from libcloud.test import MockHttp # pylint: disable-msg=E0611
+from libcloud.test.compute import TestCaseMixin # pylint: disable-msg=E0611
+from libcloud.test.file_fixtures import ComputeFileFixtures # pylint:
disable-msg=E0611
class GoGridTests(unittest.TestCase, TestCaseMixin):
Modified: libcloud/trunk/libcloud/test/compute/test_ibm_sce.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_ibm_sce.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_ibm_sce.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_ibm_sce.py Sat Jun 30 04:14:28
2012
@@ -19,10 +19,10 @@ from libcloud.compute.types import Inval
from libcloud.compute.drivers.ibm_sce import IBMNodeDriver as IBM
from libcloud.compute.base import Node, NodeImage, NodeSize, NodeLocation
-from test import MockHttp
-from test.compute import TestCaseMixin
-from test.file_fixtures import ComputeFileFixtures
-from test.secrets import IBM_PARAMS
+from libcloud.test import MockHttp
+from libcloud.test.compute import TestCaseMixin
+from libcloud.test.file_fixtures import ComputeFileFixtures
+from libcloud.test.secrets import IBM_PARAMS
class IBMTests(unittest.TestCase, TestCaseMixin):
"""
Modified: libcloud/trunk/libcloud/test/compute/test_joyent.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_joyent.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_joyent.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_joyent.py Sat Jun 30 04:14:28 2012
@@ -21,10 +21,10 @@ from libcloud.common.types import Libclo
from libcloud.compute.base import Node, NodeState
from libcloud.compute.drivers.joyent import JoyentNodeDriver
-from test import MockHttp
-from test.compute import TestCaseMixin
-from test.file_fixtures import ComputeFileFixtures
-from test.secrets import JOYENT_PARAMS
+from libcloud.test import MockHttp
+from libcloud.test.compute import TestCaseMixin
+from libcloud.test.file_fixtures import ComputeFileFixtures
+from libcloud.test.secrets import JOYENT_PARAMS
class JoyentTestCase(unittest.TestCase):
Modified: libcloud/trunk/libcloud/test/compute/test_ktucloud.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_ktucloud.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_ktucloud.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_ktucloud.py Sat Jun 30 04:14:28
2012
@@ -33,9 +33,9 @@ except AttributeError:
from libcloud.compute.drivers.ktucloud import KTUCloudNodeDriver
from libcloud.compute.types import DeploymentError, LibcloudError
-from test import MockHttpTestCase
-from test.compute import TestCaseMixin
-from test.file_fixtures import ComputeFileFixtures
+from libcloud.test import MockHttpTestCase
+from libcloud.test.compute import TestCaseMixin
+from libcloud.test.file_fixtures import ComputeFileFixtures
class KTUCloudNodeDriverTest(unittest.TestCase, TestCaseMixin):
Modified: libcloud/trunk/libcloud/test/compute/test_linode.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_linode.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_linode.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_linode.py Sat Jun 30 04:14:28 2012
@@ -24,8 +24,8 @@ from libcloud.utils.py3 import httplib
from libcloud.compute.drivers.linode import LinodeNodeDriver
from libcloud.compute.base import Node, NodeAuthPassword, NodeAuthSSHKey
-from test import MockHttp
-from test.compute import TestCaseMixin
+from libcloud.test import MockHttp
+from libcloud.test.compute import TestCaseMixin
class LinodeTest(unittest.TestCase, TestCaseMixin):
# The Linode test suite
Modified: libcloud/trunk/libcloud/test/compute/test_opennebula.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_opennebula.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_opennebula.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_opennebula.py Sat Jun 30 04:14:28
2012
@@ -30,12 +30,12 @@ from libcloud.utils.py3 import httplib
from libcloud.compute.base import Node, NodeImage, NodeSize, NodeState
from libcloud.compute.drivers.opennebula import *
-from test.file_fixtures import ComputeFileFixtures
+from libcloud.test.file_fixtures import ComputeFileFixtures
from libcloud.common.types import InvalidCredsError
-from test import MockResponse, MockHttp
-from test.compute import TestCaseMixin
+from libcloud.test import MockResponse, MockHttp
+from libcloud.test.compute import TestCaseMixin
-from test.secrets import OPENNEBULA_PARAMS
+from libcloud.test.secrets import OPENNEBULA_PARAMS
class OpenNebulaCaseMixin(TestCaseMixin):
Modified: libcloud/trunk/libcloud/test/compute/test_openstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_openstack.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_openstack.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_openstack.py Sat Jun 30 04:14:28
2012
@@ -35,11 +35,11 @@ from libcloud.compute.drivers.openstack
from libcloud.compute.base import Node, NodeImage, NodeSize
from libcloud.pricing import set_pricing, clear_pricing_data
-from test import MockResponse, MockHttpTestCase, XML_HEADERS
-from test.file_fixtures import ComputeFileFixtures, OpenStackFixtures
-from test.compute import TestCaseMixin
+from libcloud.test import MockResponse, MockHttpTestCase, XML_HEADERS
+from libcloud.test.file_fixtures import ComputeFileFixtures, OpenStackFixtures
+from libcloud.test.compute import TestCaseMixin
-from test.secrets import OPENSTACK_PARAMS
+from libcloud.test.secrets import OPENSTACK_PARAMS
class OpenStack_1_0_ResponseTestCase(unittest.TestCase):
Modified: libcloud/trunk/libcloud/test/compute/test_opsource.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_opsource.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_opsource.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_opsource.py Sat Jun 30 04:14:28
2012
@@ -21,11 +21,11 @@ from libcloud.compute.drivers.opsource i
from libcloud.compute.drivers.opsource import OpsourceAPIException
from libcloud.compute.base import Node, NodeAuthPassword, NodeLocation
-from test import MockHttp
-from test.compute import TestCaseMixin
-from test.file_fixtures import ComputeFileFixtures
+from libcloud.test import MockHttp
+from libcloud.test.compute import TestCaseMixin
+from libcloud.test.file_fixtures import ComputeFileFixtures
-from test.secrets import OPSOURCE_PARAMS
+from libcloud.test.secrets import OPSOURCE_PARAMS
class OpsourceTests(unittest.TestCase, TestCaseMixin):
Modified: libcloud/trunk/libcloud/test/compute/test_rackspace.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_rackspace.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_rackspace.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_rackspace.py Sat Jun 30 04:14:28
2012
@@ -16,9 +16,9 @@ import sys
import unittest
from libcloud.compute.drivers.rackspace import RackspaceNodeDriver
-from test.compute.test_openstack import OpenStack_1_0_Tests
+from libcloud.test.compute.test_openstack import OpenStack_1_0_Tests
-from test.secrets import RACKSPACE_PARAMS
+from libcloud.test.secrets import RACKSPACE_PARAMS
class RackspaceTests(OpenStack_1_0_Tests):
Modified: libcloud/trunk/libcloud/test/compute/test_rackspacenova.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_rackspacenova.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_rackspacenova.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_rackspacenova.py Sat Jun 30
04:14:28 2012
@@ -20,10 +20,10 @@ from libcloud.utils.py3 import httplib
from libcloud.compute.drivers.rackspacenova import
RackspaceNovaBetaNodeDriver, \
RackspaceNovaDfwNodeDriver,
\
RackspaceNovaLonNodeDriver
-from test.compute.test_openstack import OpenStack_1_1_Tests,
OpenStack_1_1_MockHttp
+from libcloud.test.compute.test_openstack import OpenStack_1_1_Tests,
OpenStack_1_1_MockHttp
from libcloud.pricing import clear_pricing_data
-from test.secrets import RACKSPACE_NOVA_PARAMS
+from libcloud.test.secrets import RACKSPACE_NOVA_PARAMS
class RackspaceNovaMockHttp(OpenStack_1_1_MockHttp):
Modified: libcloud/trunk/libcloud/test/compute/test_rimuhosting.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_rimuhosting.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_rimuhosting.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_rimuhosting.py Sat Jun 30
04:14:28 2012
@@ -20,9 +20,9 @@ from libcloud.utils.py3 import httplib
from libcloud.compute.drivers.rimuhosting import RimuHostingNodeDriver
-from test import MockHttp
-from test.compute import TestCaseMixin
-from test.file_fixtures import ComputeFileFixtures
+from libcloud.test import MockHttp
+from libcloud.test.compute import TestCaseMixin
+from libcloud.test.file_fixtures import ComputeFileFixtures
class RimuHostingTest(unittest.TestCase, TestCaseMixin):
def setUp(self):
Modified: libcloud/trunk/libcloud/test/compute/test_slicehost.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_slicehost.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_slicehost.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_slicehost.py Sat Jun 30 04:14:28
2012
@@ -22,10 +22,10 @@ from libcloud.compute.drivers.slicehost
from libcloud.compute.types import NodeState, InvalidCredsError
from libcloud.compute.base import Node, NodeImage, NodeSize
-from test import MockHttp
-from test.compute import TestCaseMixin
-from test.file_fixtures import ComputeFileFixtures
-from test.secrets import SLICEHOST_PARAMS
+from libcloud.test import MockHttp
+from libcloud.test.compute import TestCaseMixin
+from libcloud.test.file_fixtures import ComputeFileFixtures
+from libcloud.test.secrets import SLICEHOST_PARAMS
class SlicehostTest(unittest.TestCase, TestCaseMixin):
Modified: libcloud/trunk/libcloud/test/compute/test_softlayer.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_softlayer.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_softlayer.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_softlayer.py Sat Jun 30 04:14:28
2012
@@ -25,9 +25,9 @@ from libcloud.utils.py3 import next
from libcloud.compute.drivers.softlayer import SoftLayerNodeDriver as SoftLayer
from libcloud.compute.types import NodeState
-from test import MockHttp # pylint: disable-msg=E0611
-from test.file_fixtures import ComputeFileFixtures # pylint: disable-msg=E0611
-from test.secrets import SOFTLAYER_PARAMS
+from libcloud.test import MockHttp # pylint: disable-msg=E0611
+from libcloud.test.file_fixtures import ComputeFileFixtures # pylint:
disable-msg=E0611
+from libcloud.test.secrets import SOFTLAYER_PARAMS
class MockSoftLayerTransport(xmlrpclib.Transport):
Modified: libcloud/trunk/libcloud/test/compute/test_vcl.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_vcl.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_vcl.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_vcl.py Sat Jun 30 04:14:28 2012
@@ -25,9 +25,9 @@ from libcloud.utils.py3 import next
from libcloud.compute.drivers.vcl import VCLNodeDriver as VCL
from libcloud.compute.types import NodeState
-from test import MockHttp
-from test.file_fixtures import ComputeFileFixtures
-from test.secrets import VCL_PARAMS
+from libcloud.test import MockHttp
+from libcloud.test.file_fixtures import ComputeFileFixtures
+from libcloud.test.secrets import VCL_PARAMS
class MockVCLTransport(xmlrpclib.Transport):
Modified: libcloud/trunk/libcloud/test/compute/test_vcloud.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_vcloud.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_vcloud.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_vcloud.py Sat Jun 30 04:14:28 2012
@@ -24,11 +24,11 @@ from libcloud.compute.drivers.vcloud imp
from libcloud.compute.base import Node, NodeImage
from libcloud.compute.types import NodeState
-from test import MockHttp
-from test.compute import TestCaseMixin
-from test.file_fixtures import ComputeFileFixtures
+from libcloud.test import MockHttp
+from libcloud.test.compute import TestCaseMixin
+from libcloud.test.file_fixtures import ComputeFileFixtures
-from test.secrets import VCLOUD_PARAMS
+from libcloud.test.secrets import VCLOUD_PARAMS
class TerremarkTests(unittest.TestCase, TestCaseMixin):
Modified: libcloud/trunk/libcloud/test/compute/test_voxel.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_voxel.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_voxel.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_voxel.py Sat Jun 30 04:14:28 2012
@@ -20,10 +20,10 @@ from libcloud.compute.base import Node,
from libcloud.compute.drivers.voxel import VoxelNodeDriver as Voxel
from libcloud.compute.types import InvalidCredsError
-from test import MockHttp
-from test.file_fixtures import ComputeFileFixtures
+from libcloud.test import MockHttp
+from libcloud.test.file_fixtures import ComputeFileFixtures
-from test.secrets import VOXEL_PARAMS
+from libcloud.test.secrets import VOXEL_PARAMS
class VoxelTest(unittest.TestCase):
Modified: libcloud/trunk/libcloud/test/compute/test_vpsnet.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_vpsnet.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_vpsnet.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_vpsnet.py Sat Jun 30 04:14:28 2012
@@ -20,10 +20,10 @@ from libcloud.compute.drivers.vpsnet imp
from libcloud.compute.base import Node
from libcloud.compute.types import NodeState
-from test import MockHttp
-from test.compute import TestCaseMixin
+from libcloud.test import MockHttp
+from libcloud.test.compute import TestCaseMixin
-from test.secrets import VPSNET_PARAMS
+from libcloud.test.secrets import VPSNET_PARAMS
class VPSNetTests(unittest.TestCase, TestCaseMixin):
Modified: libcloud/trunk/libcloud/test/dns/test_linode.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/dns/test_linode.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/dns/test_linode.py (original)
+++ libcloud/trunk/libcloud/test/dns/test_linode.py Sat Jun 30 04:14:28 2012
@@ -22,9 +22,9 @@ from libcloud.dns.types import RecordTyp
from libcloud.dns.types import RecordDoesNotExistError
from libcloud.dns.drivers.linode import LinodeDNSDriver
-from test import MockHttp
-from test.file_fixtures import DNSFileFixtures
-from test.secrets import DNS_PARAMS_LINODE
+from libcloud.test import MockHttp
+from libcloud.test.file_fixtures import DNSFileFixtures
+from libcloud.test.secrets import DNS_PARAMS_LINODE
class LinodeTests(unittest.TestCase):
Modified: libcloud/trunk/libcloud/test/dns/test_rackspace.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/dns/test_rackspace.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/dns/test_rackspace.py (original)
+++ libcloud/trunk/libcloud/test/dns/test_rackspace.py Sat Jun 30 04:14:28 2012
@@ -23,9 +23,9 @@ from libcloud.dns.types import RecordDoe
from libcloud.dns.drivers.rackspace import RackspaceUSDNSDriver
from libcloud.dns.drivers.rackspace import RackspaceUKDNSDriver
-from test import MockHttp
-from test.file_fixtures import DNSFileFixtures
-from test.secrets import DNS_PARAMS_RACKSPACE
+from libcloud.test import MockHttp
+from libcloud.test.file_fixtures import DNSFileFixtures
+from libcloud.test.secrets import DNS_PARAMS_RACKSPACE
class RackspaceUSTests(unittest.TestCase):
Modified: libcloud/trunk/libcloud/test/dns/test_zerigo.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/dns/test_zerigo.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/dns/test_zerigo.py (original)
+++ libcloud/trunk/libcloud/test/dns/test_zerigo.py Sat Jun 30 04:14:28 2012
@@ -22,9 +22,9 @@ from libcloud.dns.types import RecordTyp
from libcloud.dns.types import RecordDoesNotExistError
from libcloud.dns.drivers.zerigo import ZerigoDNSDriver, ZerigoError
-from test import MockHttp
-from test.file_fixtures import DNSFileFixtures
-from test.secrets import DNS_PARAMS_ZERIGO
+from libcloud.test import MockHttp
+from libcloud.test.file_fixtures import DNSFileFixtures
+from libcloud.test.secrets import DNS_PARAMS_ZERIGO
class ZerigoTests(unittest.TestCase):
Modified: libcloud/trunk/libcloud/test/loadbalancer/test_brightbox.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/loadbalancer/test_brightbox.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/loadbalancer/test_brightbox.py (original)
+++ libcloud/trunk/libcloud/test/loadbalancer/test_brightbox.py Sat Jun 30
04:14:28 2012
@@ -21,9 +21,9 @@ from libcloud.loadbalancer.base import M
from libcloud.loadbalancer.drivers.brightbox import BrightboxLBDriver
from libcloud.loadbalancer.types import State
-from test import MockHttpTestCase
-from test.secrets import LB_BRIGHTBOX_PARAMS
-from test.file_fixtures import LoadBalancerFileFixtures
+from libcloud.test import MockHttpTestCase
+from libcloud.test.secrets import LB_BRIGHTBOX_PARAMS
+from libcloud.test.file_fixtures import LoadBalancerFileFixtures
class BrightboxLBTests(unittest.TestCase):
Modified: libcloud/trunk/libcloud/test/loadbalancer/test_cloudstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/loadbalancer/test_cloudstack.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/loadbalancer/test_cloudstack.py (original)
+++ libcloud/trunk/libcloud/test/loadbalancer/test_cloudstack.py Sat Jun 30
04:14:28 2012
@@ -19,8 +19,8 @@ from libcloud.common.types import Libclo
from libcloud.loadbalancer.base import LoadBalancer, Member, Algorithm
from libcloud.loadbalancer.drivers.cloudstack import CloudStackLBDriver
-from test import MockHttpTestCase
-from test.file_fixtures import LoadBalancerFileFixtures
+from libcloud.test import MockHttpTestCase
+from libcloud.test.file_fixtures import LoadBalancerFileFixtures
class CloudStackLBTests(unittest.TestCase):
def setUp(self):
Modified: libcloud/trunk/libcloud/test/loadbalancer/test_gogrid.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/loadbalancer/test_gogrid.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/loadbalancer/test_gogrid.py (original)
+++ libcloud/trunk/libcloud/test/loadbalancer/test_gogrid.py Sat Jun 30
04:14:28 2012
@@ -25,8 +25,8 @@ from libcloud.compute.drivers.dummy impo
from libcloud.loadbalancer.base import LoadBalancer, Member, Algorithm
from libcloud.loadbalancer.drivers.gogrid import GoGridLBDriver
-from test import MockHttpTestCase
-from test.file_fixtures import LoadBalancerFileFixtures
+from libcloud.test import MockHttpTestCase
+from libcloud.test.file_fixtures import LoadBalancerFileFixtures
class GoGridTests(unittest.TestCase):
Modified: libcloud/trunk/libcloud/test/loadbalancer/test_rackspace.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/loadbalancer/test_rackspace.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/loadbalancer/test_rackspace.py (original)
+++ libcloud/trunk/libcloud/test/loadbalancer/test_rackspace.py Sat Jun 30
04:14:28 2012
@@ -32,8 +32,8 @@ from libcloud.loadbalancer.drivers.racks
from libcloud.loadbalancer.drivers.rackspace import RackspaceAccessRuleType
from libcloud.common.types import LibcloudError
-from test import MockHttpTestCase
-from test.file_fixtures import LoadBalancerFileFixtures, OpenStackFixtures
+from libcloud.test import MockHttpTestCase
+from libcloud.test.file_fixtures import LoadBalancerFileFixtures,
OpenStackFixtures
class RackspaceLBTests(unittest.TestCase):
Modified: libcloud/trunk/libcloud/test/storage/test_atmos.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/storage/test_atmos.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/storage/test_atmos.py (original)
+++ libcloud/trunk/libcloud/test/storage/test_atmos.py Sat Jun 30 04:14:28 2012
@@ -33,8 +33,8 @@ from libcloud.storage.types import Conta
from libcloud.storage.drivers.atmos import AtmosConnection, AtmosDriver
from libcloud.storage.drivers.dummy import DummyIterator
-from test import StorageMockHttp, MockRawResponse
-from test.file_fixtures import StorageFileFixtures
+from libcloud.test import StorageMockHttp, MockRawResponse
+from libcloud.test.file_fixtures import StorageFileFixtures
class AtmosTests(unittest.TestCase):
def setUp(self):
Modified: libcloud/trunk/libcloud/test/storage/test_base.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/storage/test_base.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/storage/test_base.py (original)
+++ libcloud/trunk/libcloud/test/storage/test_base.py Sat Jun 30 04:14:28 2012
@@ -28,7 +28,7 @@ if PY3:
from libcloud.storage.base import StorageDriver
-from test import StorageMockHttp # pylint: disable-msg=E0611
+from libcloud.test import StorageMockHttp # pylint: disable-msg=E0611
class BaseStorageTests(unittest.TestCase):
Modified: libcloud/trunk/libcloud/test/storage/test_cloudfiles.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/storage/test_cloudfiles.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/storage/test_cloudfiles.py (original)
+++ libcloud/trunk/libcloud/test/storage/test_cloudfiles.py Sat Jun 30 04:14:28
2012
@@ -41,8 +41,8 @@ from libcloud.storage.types import Inval
from libcloud.storage.drivers.cloudfiles import CloudFilesStorageDriver
from libcloud.storage.drivers.dummy import DummyIterator
-from test import StorageMockHttp, MockRawResponse # pylint: disable-msg=E0611
-from test.file_fixtures import StorageFileFixtures, OpenStackFixtures #
pylint: disable-msg=E0611
+from libcloud.test import StorageMockHttp, MockRawResponse # pylint:
disable-msg=E0611
+from libcloud.test.file_fixtures import StorageFileFixtures, OpenStackFixtures
# pylint: disable-msg=E0611
current_hash = None
Modified: libcloud/trunk/libcloud/test/storage/test_google_storage.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/storage/test_google_storage.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/storage/test_google_storage.py (original)
+++ libcloud/trunk/libcloud/test/storage/test_google_storage.py Sat Jun 30
04:14:28 2012
@@ -17,10 +17,10 @@ import sys
import unittest
from libcloud.storage.drivers.google_storage import GoogleStorageDriver
-from test.storage.test_s3 import S3Tests, S3MockHttp
+from libcloud.test.storage.test_s3 import S3Tests, S3MockHttp
-from test.file_fixtures import StorageFileFixtures
-from test.secrets import STORAGE_GOOGLE_STORAGE_PARAMS
+from libcloud.test.file_fixtures import StorageFileFixtures
+from libcloud.test.secrets import STORAGE_GOOGLE_STORAGE_PARAMS
class GoogleStorageMockHttp(S3MockHttp):
Modified: libcloud/trunk/libcloud/test/storage/test_s3.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/storage/test_s3.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/storage/test_s3.py (original)
+++ libcloud/trunk/libcloud/test/storage/test_s3.py Sat Jun 30 04:14:28 2012
@@ -33,9 +33,9 @@ from libcloud.storage.drivers.s3 import
from libcloud.storage.drivers.s3 import S3APNEStorageDriver
from libcloud.storage.drivers.dummy import DummyIterator
-from test import StorageMockHttp, MockRawResponse # pylint: disable-msg=E0611
-from test.file_fixtures import StorageFileFixtures # pylint: disable-msg=E0611
-from test.secrets import STORAGE_S3_PARAMS
+from libcloud.test import StorageMockHttp, MockRawResponse # pylint:
disable-msg=E0611
+from libcloud.test.file_fixtures import StorageFileFixtures # pylint:
disable-msg=E0611
+from libcloud.test.secrets import STORAGE_S3_PARAMS
class S3MockHttp(StorageMockHttp):
Modified: libcloud/trunk/libcloud/test/test_file_fixtures.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/test_file_fixtures.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/test_file_fixtures.py (original)
+++ libcloud/trunk/libcloud/test/test_file_fixtures.py Sat Jun 30 04:14:28 2012
@@ -15,7 +15,7 @@
import sys
import unittest
-from test.file_fixtures import ComputeFileFixtures
+from libcloud.test.file_fixtures import ComputeFileFixtures
class FileFixturesTests(unittest.TestCase):
Modified: libcloud/trunk/setup.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/setup.py?rev=1355632&r1=1355631&r2=1355632&view=diff
==============================================================================
--- libcloud/trunk/setup.py (original)
+++ libcloud/trunk/setup.py Sat Jun 30 04:14:28 2012
@@ -29,8 +29,9 @@ libcloud.utils.misc.SHOW_DEPRECATION_WAR
HTML_VIEWSOURCE_BASE = 'https://svn.apache.org/viewvc/libcloud/trunk'
PROJECT_BASE_DIR = 'http://libcloud.apache.org'
-TEST_PATHS = ['test', 'test/common', 'test/compute', 'test/storage',
- 'test/loadbalancer', 'test/dns']
+TEST_PATHS = ['libcloud/test', 'libcloud/test/common', 'libcloud/test/compute',
+ 'libcloud/test/storage', 'libcloud/test/loadbalancer',
+ 'libcloud/test/dns']
DOC_TEST_MODULES = ['libcloud.compute.drivers.dummy',
'libcloud.storage.drivers.dummy',
'libcloud.dns.drivers.dummy']
@@ -81,13 +82,13 @@ class TestCommand(Command):
sys.exit(status)
def _run_tests(self):
- secrets_current = pjoin(self._dir, 'test', 'secrets.py')
- secrets_dist = pjoin(self._dir, 'test', 'secrets.py-dist')
+ secrets_current = pjoin(self._dir, 'libcloud/test', 'secrets.py')
+ secrets_dist = pjoin(self._dir, 'libcloud/test', 'secrets.py-dist')
if not os.path.isfile(secrets_current):
print("Missing " + secrets_current)
print("Maybe you forgot to copy it from -dist:")
- print("cp test/secrets.py-dist test/secrets.py")
+ print("cp libcloud/test/secrets.py-dist libcloud/test/secrets.py")
sys.exit(1)
mtime_current = os.path.getmtime(secrets_current)
