Start fixing the integration tests

The integration tests do work when run as a file, but fail when
attempting to run the whole thing as one. In order to get some tests
starting to pass green I think the best way would be to run each on and
see if that helps.

Author: SimonRichardson

juju/bundle.py

@@ -307,7 +307,7 @@ def resolve(self, reference):
 
 
 def is_local_charm(charm_url):
-    return charm_url.startswith('.') or charm_url.startswith('local:')
+    return charm_url.startswith('.') or charm_url.startswith('local:') or os.path.isabs(charm_url)
 
 
 def get_charm_series(path):
@@ -476,7 +476,7 @@ async def run(self, context):
         if self.channel is not None and self.channel != "":
             channel = Channel.parse(self.channel).normalize()
 
-        origin = context.origins[str(url)][str(channel)]
+        origin = context.origins.get(str(url), {}).get(str(channel), None)
         if origin is None:
             raise JujuError("expected origin to be valid for application {} and charm {}".format(self.application, self.charm))
 
@@ -570,6 +570,8 @@ async def run(self, context):
         ch = None
         identifier = None
         if Schema.LOCAL.matches(url.schema):
+            origin = client.CharmOrigin(source="local", risk="stable")
+            context.origins[self.charm] = {str(None): origin}
             return self.charm
 
         elif Schema.CHARM_STORE.matches(url.schema):

juju/client/connection.py

@@ -314,14 +314,21 @@ async def connect(
             self.proxy.connect()
 
         _endpoints = [(endpoint, cacert)] if isinstance(endpoint, str) else [(e, cacert) for e in endpoint]
+        lastError = None
         for _ep in _endpoints:
             try:
                 await self._connect_with_redirect([_ep])
                 return self
+            except ssl.SSLError as e:
+                lastError = e
+                continue
             except OSError as e:
                 logging.debug(
                     "Cannot access endpoint {}: {}".format(_ep, e.strerror))
+                lastError = e
                 continue
+        if lastError is not None:
+            raise lastError
         raise Exception("Unable to connect to websocket")
 
     @property

juju/model.py

@@ -20,7 +20,7 @@
 
 from . import provisioner, tag, utils
 from .annotationhelper import _get_annotations, _set_annotations
-from .bundle import BundleHandler, get_charm_series
+from .bundle import BundleHandler, get_charm_series, is_local_charm
 from .charmhub import CharmHub
 from .charmstore import CharmStore
 from .client import client, connector
@@ -1428,6 +1428,11 @@ async def deploy(
         origin = None
         result = None
 
+        # Ensure what we pass in, is a string.
+        entity_url = str(entity_url)
+        if is_local_charm(entity_url) and not entity_url.startswith("local:"):
+            entity_url = "local:{}".format(entity_url)
+        print("!!!", entity_url)
         url = URL.parse(str(entity_url))
         architecture = await self._resolve_architecture(url)
 
@@ -1441,6 +1446,7 @@ async def deploy(
             if not (entity_path.is_dir() or entity_path.is_file()):
                 raise JujuError('{} path not found'.format(entity_url))
 
+            is_local = True
             is_bundle = (
                 (entity_url.endswith(".yaml") and entity_path.exists()) or
                 bundle_path.exists()
@@ -1475,13 +1481,13 @@ async def deploy(
             raise JujuError('unknown charm or bundle {}'.format(entity_url))
 
         if not application_name:
-            if Schema.LOCAL.matches(url.schema) and Schema.CHARM_STORE.matches(url.schema):
-                application_name = result['Meta']['charm-metadata']['Name']
-            else:
+            if Schema.CHARM_HUB.matches(url.schema):
                 # For charmhub charms, we don't have the metadata and we're not
                 # going to get it, so fallback to the url and use that one if a
                 # user didn't specify it.
                 application_name = url.name
+            elif result is not None and not is_bundle:
+                application_name = result['Meta']['charm-metadata']['Name']
 
         if is_bundle:
             handler = BundleHandler(self, trusted=trust, forced=force)

juju/url.py

@@ -41,7 +41,7 @@ def parse(s):
             raise JujuError("charm or bundle URL {} has unrecognized parts".format(u))
 
         if Schema.LOCAL.matches(u.scheme):
-            c = parse_v1_url(Schema.LOCAL, u, s)
+            c = URL(Schema.LOCAL, name=u.path)
         elif Schema.CHARM_STORE.matches(u.scheme):
             c = parse_v1_url(Schema.CHARM_STORE, u, s)
         else:

tests/integration/test_application.py

@@ -93,6 +93,26 @@ async def test_add_units(event_loop):
             assert isinstance(unit, Unit)
 
 
+@base.bootstrapped
+@pytest.mark.asyncio
+async def test_deploy_charmstore_charm(event_loop):
+    async with base.CleanModel() as model:
+        app = await model.deploy('cs:ubuntu-0')
+        await model.block_until(lambda: (len(app.units) > 0 and
+                                         app.units[0].machine))
+        assert app.data['charm-url'] == 'cs:ubuntu-0'
+
+
+@base.bootstrapped
+@pytest.mark.asyncio
+async def test_deploy_charmhub_charm(event_loop):
+    async with base.CleanModel() as model:
+        app = await model.deploy('hello-juju')
+        await model.block_until(lambda: (len(app.units) > 0 and
+                                         app.units[0].machine))
+        assert 'hello-juju' in app.data['charm-url'] 
+
+
 @base.bootstrapped
 @pytest.mark.asyncio
 async def test_upgrade_charm(event_loop):
@@ -135,7 +155,7 @@ async def test_upgrade_charm_revision(event_loop):
 @pytest.mark.asyncio
 async def test_upgrade_charm_switch(event_loop):
     async with base.CleanModel() as model:
-        app = await model.deploy('ubuntu-0')
+        app = await model.deploy('cs:ubuntu-0')
         await model.block_until(lambda: (len(app.units) > 0 and
                                          app.units[0].machine))
         assert app.data['charm-url'] == 'cs:ubuntu-0'

tests/integration/test_connection.py

@@ -270,6 +270,8 @@ async def test_verify_controller_cert(event_loop):
 -----END CERTIFICATE-----
 """
 
+    print(endpoint)
+
     try:
         connection = await Connection.connect(
             endpoint=endpoint,

tests/integration/test_model.py

@@ -137,7 +137,7 @@ async def test_wait_local_charm_waiting_timeout(event_loop):
 @pytest.mark.asyncio
 async def test_deploy_bundle(event_loop):
     async with base.CleanModel() as model:
-        await model.deploy('bundle/wiki-simple')
+        await model.deploy('cs:bundle/wiki-simple')
 
         for app in ('wiki', 'mysql'):
             assert app in model.applications

tests/integration/test_unit.py

@@ -13,7 +13,7 @@ async def test_run(event_loop):
 
     async with base.CleanModel() as model:
         app = await model.deploy(
-            'ubuntu-0',
+            'cs:ubuntu-0',
             application_name='ubuntu',
             series='trusty',
             channel='stable',