← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~jtv/maas/prep-filestorage into lp:maas

 

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/prep-filestorage into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/prep-filestorage/+merge/105451

As per the migration plan.  This was an easy one: nothing needed extracting and there was a separate TestCase for the model.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/prep-filestorage/+merge/105451
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/prep-filestorage into lp:maas.
=== modified file 'src/maasserver/models/__init__.py'
--- src/maasserver/models/__init__.py	2012-05-08 07:14:31 +0000
+++ src/maasserver/models/__init__.py	2012-05-11 08:04:19 +0000
@@ -880,6 +880,7 @@
         return mark_safe(get_html_display_for_key(self.key, MAX_KEY_DISPLAY))
 
 
+# Due for model migration on 2012-05-18
 class FileStorageManager(Manager):
     """Manager for `FileStorage` objects.
 
@@ -983,6 +984,7 @@
                 FileStorage.storage.delete(path)
 
 
+# Due for model migration on 2012-05-18
 class FileStorage(CleanSave, Model):
     """A simple file storage keyed on file name.
 

=== modified file 'src/maasserver/tests/test_models.py'
--- src/maasserver/tests/test_models.py	2012-05-11 05:02:59 +0000
+++ src/maasserver/tests/test_models.py	2012-05-11 08:04:19 +0000
@@ -1125,6 +1125,7 @@
         self.assertItemsEqual([key.key for key in created_keys], keys)
 
 
+# Due for model migration on 2012-05-22
 class FileStorageTest(TestCase):
     """Testing of the :class:`FileStorage` model."""
 


Follow ups