Skip to content

Instantly share code, notes, and snippets.

@mvschaik
Last active August 29, 2015 13:57
Show Gist options
  • Save mvschaik/9688128 to your computer and use it in GitHub Desktop.
Save mvschaik/9688128 to your computer and use it in GitHub Desktop.
diff --git a/hypernode/provisioning/driver/__init__.py b/hypernode/provisioning/driver/__init__.py
index 9a25a9c..e5dbce0 100644
--- a/hypernode/provisioning/driver/__init__.py
+++ b/hypernode/provisioning/driver/__init__.py
@@ -1,3 +1,6 @@
from .bytefakedriver import FakeNodeDriver
-from .vagrantdriver import VagrantDriver
+try:
+ from .vagrantdriver import VagrantDriver
+except AssertionError:
+ pass
from .cloudvpsdriver import CloudVPSDriver
\ No newline at end of file
diff --git a/hypernode/provisioning/provider.py b/hypernode/provisioning/provider.py
index 91a23f0..7467ccf 100644
--- a/hypernode/provisioning/provider.py
+++ b/hypernode/provisioning/provider.py
@@ -1,7 +1,5 @@
-import inspect
from libcloud.compute.providers import get_driver, set_driver
from hypernode.conf import settings
-from hypernode.provisioning.driver import bytefakedriver, vagrantdriver, cloudvpsdriver
BYTE_FAKE_DRIVER = 'byte_fake_driver'
BYTE_VAGRANT_DRIVER = 'vagrant'
@@ -10,7 +8,10 @@ BYTE_CLOUDVPS_DRIVER = 'cloudvps'
# Register our custom drivers
set_driver(BYTE_CLOUDVPS_DRIVER, 'hypernode.provisioning.driver.cloudvpsdriver', 'CloudVPSDriver')
-set_driver(BYTE_VAGRANT_DRIVER, 'hypernode.provisioning.driver.vagrantdriver', 'VagrantDriver')
+try:
+ set_driver(BYTE_VAGRANT_DRIVER, 'hypernode.provisioning.driver.vagrantdriver', 'VagrantDriver')
+except AssertionError:
+ pass
set_driver(BYTE_FAKE_DRIVER, 'hypernode.provisioning.driver.bytefakedriver', 'FakeNodeDriver')
diff --git a/hypernode/tests/unit/provisioning/test_provider.py b/hypernode/tests/unit/provisioning/test_provider.py
index 4a710eb..c87d4c3 100644
--- a/hypernode/tests/unit/provisioning/test_provider.py
+++ b/hypernode/tests/unit/provisioning/test_provider.py
@@ -2,7 +2,7 @@ from libcloud.compute.types import Provider
import mock
from hypernode import TestCase
from hypernode.provisioning import provider
-from hypernode.provisioning.driver import VagrantDriver, CloudVPSDriver
+from hypernode.provisioning.driver import CloudVPSDriver
from hypernode.provisioning.driver.bytefakedriver import FakeNodeDriver
from hypernode.provisioning.provider import get_config_of_provider
@@ -46,10 +46,6 @@ class TestGetConnection(TestCase):
connection = provider.get_connection(fake_provider)
self.assertIsInstance(connection, FakeNodeDriver)
- def test_that_get_connection_returns_vagrant_driver_when_given_vagrant_string(self):
- connection = provider.get_connection(provider.BYTE_VAGRANT_DRIVER)
- self.assertIsInstance(connection, VagrantDriver)
-
def test_that_get_connection_returns_cloudvps_driver_when_given_cloudvps_string(self):
with mock.patch('hypernode.provisioning.provider.settings') as settings:
settings.PROVIDERS = {'xls': {"driver": provider.BYTE_CLOUDVPS_DRIVER, "key": "abcd"}}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment