summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcameron-r <crowshanbin@gmail.com>2014-11-05 14:53:39 -0600
committercameron-r <crowshanbin@gmail.com>2014-11-05 15:27:45 -0600
commit9826b0778ccfa1dce9906e16d217207b27f2d0b8 (patch)
treecc4192c8e311c4f80fea6f6789043381ac95ba21
parenta8f09b1ccb0c070561ce9a5fea71399430701664 (diff)
Ed & Cameron | Move integration tests to separate directory
-rw-r--r--tests/integration/__init__.py0
-rw-r--r--tests/integration/ec2_test_base.py (renamed from tests/ec2_test_base.py)4
-rw-r--r--tests/integration/test_ec2driver.py (renamed from tests/test_ec2driver.py)7
-rw-r--r--tests/integration/test_security_groups.py (renamed from tests/test_security_groups.py)5
4 files changed, 9 insertions, 7 deletions
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/integration/__init__.py
diff --git a/tests/ec2_test_base.py b/tests/integration/ec2_test_base.py
index a459b53..4416df8 100644
--- a/tests/ec2_test_base.py
+++ b/tests/integration/ec2_test_base.py
@@ -7,8 +7,8 @@ import datetime
7from novaclient.v1_1 import client 7from novaclient.v1_1 import client
8from boto import ec2 8from boto import ec2
9 9
10from ..credentials import get_nova_creds 10from ...credentials import get_nova_creds
11from ..ec2driver_config import * 11from ...ec2driver_config import *
12 12
13 13
14class EC2TestBase(unittest.TestCase): 14class EC2TestBase(unittest.TestCase):
diff --git a/tests/test_ec2driver.py b/tests/integration/test_ec2driver.py
index 717753a..890b39e 100644
--- a/tests/test_ec2driver.py
+++ b/tests/integration/test_ec2driver.py
@@ -1,10 +1,11 @@
1import unittest 1import unittest
2import urllib2 2import urllib2
3from boto.exception import EC2ResponseError
4 3
4from boto.exception import EC2ResponseError
5from novaclient.v1_1 import client 5from novaclient.v1_1 import client
6from ..ec2driver_config import * 6
7from ec2_test_base import EC2TestBase 7from ...ec2driver_config import *
8from tests.integration.ec2_test_base import EC2TestBase
8 9
9 10
10class TestEC2Driver(EC2TestBase): 11class TestEC2Driver(EC2TestBase):
diff --git a/tests/test_security_groups.py b/tests/integration/test_security_groups.py
index 04517a4..f916750 100644
--- a/tests/test_security_groups.py
+++ b/tests/integration/test_security_groups.py
@@ -2,8 +2,9 @@ from time import sleep
2import unittest 2import unittest
3from random import randint 3from random import randint
4 4
5from ..ec2driver_config import * 5from ...ec2driver_config import *
6from ec2_test_base import EC2TestBase 6from tests.integration.ec2_test_base import EC2TestBase
7
7 8
8class TestSecurityGroups(EC2TestBase): 9class TestSecurityGroups(EC2TestBase):
9 10