Resolve some merge errors
@@ -18,14 +18,9 @@ from libcloud.compute.providers import Provider
from libcloud.compute.providers import get_driver
-class EC2MockDriver(object):
- region_name = 'eu-west-2'
- service_name = 'api'
-
-
class TestApiOutscale(unittest.TestCase):
cls = get_driver(Provider.OUTSCALE)
- driver = cls(key='xxxxxxxxxxxxxxxxxxxx', secret='xxxxxxxxxxxxxxxxxxxxxxxxx', region="xxxxxxxxxxxx")
+ driver = cls(key='my_key', secret='my_secret', region="my_region")
def test_locations(self):
response = self.driver.list_locations()
@@ -42,7 +37,7 @@ class TestApiOutscale(unittest.TestCase):
self.assertEqual(response.status_code, 200)
def test_images(self):
- response = self.driver.create_image(image_name="test_libcloud2", vm_id="i-dab9397e")
+ response = self.driver.create_image(image_name="image_name", vm_id="vm_id")
self.assertEqual(response.status_code, 200)
image_id = response.json()["Image"]["ImageId"]
