-import uuid
+import mock
import subprocess
+import uuid
import pytest
from juju.controller import Controller
+from juju.client.connection import JujuData
def is_bootstrapped():
model_name = 'model-{}'.format(uuid.uuid4())
self.model = await self.controller.add_model(model_name)
+ # Ensure that we connect to the new model by default. This also
+ # prevents failures if test was started with no current model.
+ self._patch_cm = mock.patch.object(JujuData, 'current_model',
+ return_value=model_name)
+ self._patch_cm.start()
+
return self.model
async def __aexit__(self, exc_type, exc, tb):
+ self._patch_cm.stop()
await self.model.disconnect()
await self.controller.destroy_model(self.model.info.uuid)
await self.controller.disconnect()