Merge lp:~rvb/maas/empty-files-1.2 into lp:maas/1.2

[Raphaël Badin]

Backport of revision 1540.

[Raphaël Badin (rvb)]

review: Approve

[MAAS Lander (maas-lander)]

No commit message specified.

[Julian Edwards (julian-edwards)]

On 26/07/13 01:40, Raphaël Badin wrote:
> The proposal to merge lp:~rvb/maas/empty-files-1.2 into lp:maas/1.2 has been updated.
>
> Commit Message changed to:
>
> Backport of revision 1540.
>

Please please please don't use commit messages like this. The first
part is ok, but I also want to see what the backport is for without
looking up revision 1540 in trunk (assuming that's where it came from -
it doesn't say).

The best format to use for backports is:
Backport of <branch> rNNNN: <commit msg from other branch>

Thanks!

[Raphaël Badin (rvb)]

All right.

=== modified file 'src/maasserver/models/filestorage.py'
--- src/maasserver/models/filestorage.py	2013-02-25 15:49:49 +0000
+++ src/maasserver/models/filestorage.py	2013-07-25 15:30:45 +0000
@@ -83,7 +83,7 @@
         unique_together = ('filename', 'owner')
 
     filename = CharField(max_length=255, unique=False, editable=False)
-    content = BinaryField(null=False)
+    content = BinaryField(null=False, blank=True)
     # owner can be None: this is to support upgrading existing
     # installations where the files were not linked to users yet.
     owner = ForeignKey(

=== modified file 'src/maasserver/tests/test_api.py'
--- src/maasserver/tests/test_api.py	2013-04-25 07:56:53 +0000
+++ src/maasserver/tests/test_api.py	2013-07-25 15:30:45 +0000
@@ -2804,6 +2804,17 @@
         self.assertIn('text/plain', response['Content-Type'])
         self.assertEqual("Filename not supplied", response.content)
 
+    def test_add_empty_file(self):
+        filename = "filename"
+        response = self.make_API_POST_request(
+            "add", filename=filename,
+            fileObj=factory.make_file_upload(content=b''))
+        self.assertEqual(httplib.CREATED, response.status_code)
+        self.assertItemsEqual(
+            [filename],
+            FileStorage.objects.filter(
+                filename=filename).values_list('filename', flat=True))
+
     def test_add_file_fails_with_no_file_attached(self):
         response = self.make_API_POST_request("add", "foo")