lp:~rvb/maas/safeguard-migrations

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:~maas-committers/maas/trunk

Gavin Panella (community): Approve on 2015-03-24

Diff: 185 lines (+95/-2)

5 files modified

src/maasserver/tests/models.py (+2/-1)
src/maasserver/tests/test_migrations.py (+29/-0)
src/maastesting/tests/test_utils.py (+19/-1)
src/maastesting/utils.py (+15/-0)
src/metadataserver/tests/test_migrations.py (+30/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3701. By Raphaël Badin on 2015-03-27

Fix lint.

3700. By Raphaël Badin on 2015-03-27

Merge trunk.

3699. By Raphaël Badin on 2015-03-25

Fix lint.

3698. By Raphaël Badin on 2015-03-25

Fix test model.

3697. By Raphaël Badin on 2015-03-25

Review fixes.

3696. By Raphaël Badin on 2015-03-24

Add test to make sure the migrations and the models are in sync.

3695. By Raphaël Badin on 2015-03-23

[r=allenap,mpontillo][bug=][author=rvb] Regenerate migration 134: this migration has been generated without merging trunk first and thus it doesn't include some of the changes introduced by previous migrations.

3694. By Gavin Panella on 2015-03-23

[r=rvb][bug=][author=allenap] Allow disconnection of field changes for testing.

Allowing tests to temporarily disable field changes makes testing post-commit code easier, because it avoids adding more boilerplate to neuter indirectly created post-commit tasks that are not the subject of the test.

This change also highlighted a test isolation problem, where the model change callbacks registered in one test were still present in other tests. Fortunately the problem was only in the tests; the code under test was fine.

3693. By Andres Rodriguez on 2015-03-20

update 1.7.2. changelog

3692. By Gavin Panella on 2015-03-20

[r=rvb][bug=][author=allenap] Keep transactions short when querying node power state after a status change.

Previously the transaction would be held open for as long as 30 seconds or more, causing serialisation failures in other transactions. Equally, serialisation failures in the held transaction would cause the power state to be queried multiple times as the retry logic did its thing.