openstack
/
charm-ops-openstack
Code Issues Proposed changes

Remove testing workaround

This commit is contained in:
Liam Young 2020-05-11 07:51:05 +00:00
parent 18b8f1fcfe
commit 5195b2b8cb
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
unit_tests/test_ops_openstack.py
View File

@ -18,14 +18,13 @@ import unittest
from mock import patch, MagicMock
from ops.testing import Harness, _TestingModelBackend
from ops.testing import Harness
from ops.model import (
ActiveStatus,
BlockedStatus,
MaintenanceStatus,
WaitingStatus,
)
from ops import framework, model
import ops_openstack
@ -95,24 +94,24 @@ class TestOSBaseCharm(CharmTestCase):
resume:
description: resume action
''')
# BEGIN: Workaround until
# https://github.com/canonical/operator/pull/196 lands
class _TestingOPSModelBackend(_TestingModelBackend):
def relation_ids(self, relation_name):
return self._relation_ids_map.get(relation_name, [])
self.harness._backend = _TestingOPSModelBackend(
self.harness._unit_name)
self.harness._model = model.Model(
self.harness._unit_name,
self.harness._meta,
self.harness._backend)
self.harness._framework = framework.Framework(
":memory:",
self.harness._charm_dir,
self.harness._meta,
self.harness._model)
# END Workaround
# # BEGIN: Workaround until
# # https://github.com/canonical/operator/pull/196 lands
# class _TestingOPSModelBackend(_TestingModelBackend):
#
# def relation_ids(self, relation_name):
# return self._relation_ids_map.get(relation_name, [])
# self.harness._backend = _TestingOPSModelBackend(
# self.harness._unit_name)
# self.harness._model = model.Model(
# self.harness._unit_name,
# self.harness._meta,
# self.harness._backend)
# self.harness._framework = framework.Framework(
# ":memory:",
# self.harness._charm_dir,
# self.harness._meta,
# self.harness._model)
# # END Workaround
def test_init(self):
self.harness.begin()