Ed & Cameron | Move integration tests to separate directory
This commit is contained in:
parent
a8f09b1ccb
commit
9826b0778c
|
@ -7,8 +7,8 @@ import datetime
|
||||||
from novaclient.v1_1 import client
|
from novaclient.v1_1 import client
|
||||||
from boto import ec2
|
from boto import ec2
|
||||||
|
|
||||||
from ..credentials import get_nova_creds
|
from ...credentials import get_nova_creds
|
||||||
from ..ec2driver_config import *
|
from ...ec2driver_config import *
|
||||||
|
|
||||||
|
|
||||||
class EC2TestBase(unittest.TestCase):
|
class EC2TestBase(unittest.TestCase):
|
|
@ -1,10 +1,11 @@
|
||||||
import unittest
|
import unittest
|
||||||
import urllib2
|
import urllib2
|
||||||
from boto.exception import EC2ResponseError
|
|
||||||
|
|
||||||
|
from boto.exception import EC2ResponseError
|
||||||
from novaclient.v1_1 import client
|
from novaclient.v1_1 import client
|
||||||
from ..ec2driver_config import *
|
|
||||||
from ec2_test_base import EC2TestBase
|
from ...ec2driver_config import *
|
||||||
|
from tests.integration.ec2_test_base import EC2TestBase
|
||||||
|
|
||||||
|
|
||||||
class TestEC2Driver(EC2TestBase):
|
class TestEC2Driver(EC2TestBase):
|
|
@ -2,8 +2,9 @@ from time import sleep
|
||||||
import unittest
|
import unittest
|
||||||
from random import randint
|
from random import randint
|
||||||
|
|
||||||
from ..ec2driver_config import *
|
from ...ec2driver_config import *
|
||||||
from ec2_test_base import EC2TestBase
|
from tests.integration.ec2_test_base import EC2TestBase
|
||||||
|
|
||||||
|
|
||||||
class TestSecurityGroups(EC2TestBase):
|
class TestSecurityGroups(EC2TestBase):
|
||||||
|
|
Loading…
Reference in New Issue