X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Ftests%2Funit%2Ftest_juju_watcher.py;h=5f8127420649a3c63629ea551a3cb6807dfb53d7;hp=41065bff44e31c4992340c92e0b1f44c45c7c911;hb=refs%2Fchanges%2F16%2F10616%2F9;hpb=667696ef11356f3267df58f2a81c6ecebb0e94b9;ds=sidebyside diff --git a/n2vc/tests/unit/test_juju_watcher.py b/n2vc/tests/unit/test_juju_watcher.py index 41065bf..5f81274 100644 --- a/n2vc/tests/unit/test_juju_watcher.py +++ b/n2vc/tests/unit/test_juju_watcher.py @@ -45,6 +45,7 @@ class JujuWatcherTest(asynctest.TestCase): def test_model_watcher(self, allwatcher): tests = Deltas allwatcher.return_value = FakeWatcher() + n2vc = AsyncMock() for test in tests: with self.assertRaises(asyncio.TimeoutError): allwatcher.return_value.delta_to_return = [test.delta] @@ -55,12 +56,12 @@ class JujuWatcherTest(asynctest.TestCase): test.filter.entity_type, timeout=0, db_dict={"something"}, - n2vc=self.n2vc, + n2vc=n2vc, + vca_id=None, ) ) - self.assertEqual(self.n2vc.last_written_values, test.db.data) - self.n2vc.last_written_values = None + n2vc.write_app_status_to_db.assert_called() @mock.patch("n2vc.juju_watcher.asyncio.wait") def test_wait_for(self, wait): @@ -142,6 +143,7 @@ class StatusTest(TestCase): self.assertTrue(isinstance(value, str)) +@asynctest.mock.patch("asyncio.sleep") class WaitForModelTest(asynctest.TestCase): @asynctest.mock.patch("juju.client.connector.Connector.connect") def setUp(self, mock_connect=None): @@ -149,7 +151,7 @@ class WaitForModelTest(asynctest.TestCase): self.model = Model() @asynctest.mock.patch("juju.model.Model.block_until") - def test_wait_for_model(self, mock_block_until): + def test_wait_for_model(self, mock_block_until, mock_sleep): self.loop.run_until_complete( JujuModelWatcher.wait_for_model(self.model, timeout=None) ) @@ -157,7 +159,7 @@ class WaitForModelTest(asynctest.TestCase): @asynctest.mock.patch("asyncio.ensure_future") @asynctest.mock.patch("asyncio.wait") - def test_wait_for_model_exception(self, mock_wait, mock_ensure_future): + def test_wait_for_model_exception(self, mock_wait, mock_ensure_future, mock_sleep): task = Mock() mock_ensure_future.return_value = task mock_wait.side_effect = Exception