diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2019-04-10 20:21:37 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2019-04-10 20:21:37 +0000 |
| commit | 6322c2ddf4b68a8e7cc467a07fb20a1d151a2ef3 (patch) | |
| tree | 7d4dbf157acc58df6bc8e4050c80afe5d72655a8 /cloudinit/sources/tests | |
| parent | b76714c355a87416f9f07156b0f025aceaca7296 (diff) | |
| download | vyos-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 'cloudinit/sources/tests')
| -rw-r--r-- | cloudinit/sources/tests/test_init.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/cloudinit/sources/tests/test_init.py b/cloudinit/sources/tests/test_init.py index cb1912be..6378e98b 100644 --- a/cloudinit/sources/tests/test_init.py +++ b/cloudinit/sources/tests/test_init.py @@ -575,21 +575,6 @@ class TestDataSource(CiTestCase): " events: New instance first boot", self.logs.getvalue()) - def test_data_sources_cant_mutate_update_events_for_others(self): - """update_events shouldn't be changed for other DSes (LP: #1819913)""" - - class ModifyingDS(DataSource): - - def __init__(self, sys_cfg, distro, paths): - # This mirrors what DataSourceAzure does which causes LP: - # #1819913 - DataSource.__init__(self, sys_cfg, distro, paths) - self.update_events['network'].add(EventType.BOOT) - - before_update_events = copy.deepcopy(self.datasource.update_events) - ModifyingDS(self.sys_cfg, self.distro, self.paths) - self.assertEqual(before_update_events, self.datasource.update_events) - class TestRedactSensitiveData(CiTestCase): |