summaryrefslogtreecommitdiff
path: root/tests/unittests/test_datasource
diff options
context:
space:
mode:
authorDaniel Watkins <daniel.watkins@canonical.com>2019-04-10 20:21:37 +0000
committerServer Team CI Bot <josh.powers+server-team-bot@canonical.com>2019-04-10 20:21:37 +0000
commit6322c2ddf4b68a8e7cc467a07fb20a1d151a2ef3 (patch)
tree7d4dbf157acc58df6bc8e4050c80afe5d72655a8 /tests/unittests/test_datasource
parentb76714c355a87416f9f07156b0f025aceaca7296 (diff)
downloadvyos-cloud-init-6322c2ddf4b68a8e7cc467a07fb20a1d151a2ef3.tar.gz
vyos-cloud-init-6322c2ddf4b68a8e7cc467a07fb20a1d151a2ef3.zip
Revert "DataSource: move update_events from a class to an instance..."
Moving update_events from a class attribute to an instance attribute means that it doesn't exist on DataSource objects that are unpickled, causing tracebacks on cloud-init upgrade. As this change is only required for cloud-init installations which don't utilise ds-identify, we're backing it out to be reintroduced once the upgrade path bug has been addressed. This reverts commit f2fd6eac4407e60d0e98826ab03847dda4cde138.
Diffstat (limited to 'tests/unittests/test_datasource')
-rw-r--r--tests/unittests/test_datasource/test_scaleway.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/unittests/test_datasource/test_scaleway.py b/tests/unittests/test_datasource/test_scaleway.py
index 3bfd7527..f96bf0a2 100644
--- a/tests/unittests/test_datasource/test_scaleway.py
+++ b/tests/unittests/test_datasource/test_scaleway.py
@@ -7,7 +7,6 @@ import requests
from cloudinit import helpers
from cloudinit import settings
-from cloudinit.event import EventType
from cloudinit.sources import DataSourceScaleway
from cloudinit.tests.helpers import mock, HttprettyTestCase, CiTestCase
@@ -404,9 +403,3 @@ class TestDataSourceScaleway(HttprettyTestCase):
netcfg = self.datasource.network_config
self.assertEqual(netcfg, '0xdeadbeef')
-
- def test_update_events_is_correct(self):
- """ensure update_events contains correct data"""
- self.assertEqual(
- {'network': {EventType.BOOT_NEW_INSTANCE, EventType.BOOT}},
- self.datasource.update_events)