Merge lp:~rvb/maas/dj16-bug-1257269 into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Define DJANGO_SETTINGS_MODULE before using django.core.handlers.wsgi.WSGIRequest.

The change to test_returns_ValidationError_message_dict_as_json is a drive-by fix.

[Julian Edwards (julian-edwards)]

 review: approve

review: Approve

=== modified file 'src/apiclient/testing/django.py'
--- src/apiclient/testing/django.py	2013-10-07 09:12:40 +0000
+++ src/apiclient/testing/django.py	2013-12-03 13:00:42 +0000
@@ -15,9 +15,9 @@
 __all__ = []
 
 from io import BytesIO
+import os
 
 from django.core.files.uploadhandler import MemoryFileUploadHandler
-from django.core.handlers.wsgi import WSGIRequest
 from django.http.multipartparser import MultiPartParser
 from maasserver.utils import ignore_unused
 
@@ -73,6 +73,10 @@
     environ['REQUEST_METHOD'] = 'POST'
     environ['SCRIPT_NAME'] = ''
     environ['PATH_INFO'] = ''
+    # Django 1.6 needs DJANGO_SETTINGS_MODULE to be defined
+    # when importing WSGIRequest.
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'maas.development'
+    from django.core.handlers.wsgi import WSGIRequest
     request = WSGIRequest(environ)
     translate_mime(request)
     return request.data

=== modified file 'src/maasserver/tests/test_middleware.py'
--- src/maasserver/tests/test_middleware.py	2013-10-11 09:08:34 +0000
+++ src/maasserver/tests/test_middleware.py	2013-12-03 13:00:42 +0000
@@ -148,9 +148,8 @@
             (response.status_code, response.content))
 
     def test_returns_ValidationError_message_dict_as_json(self):
-        exception = ValidationError(factory.getRandomString())
-        exception_dict = {'hostname': 'invalid'}
-        setattr(exception, 'message_dict', exception_dict)
+        exception_dict = {'hostname': ['invalid']}
+        exception = ValidationError(exception_dict)
         response = self.process_exception(exception)
         self.assertEqual(exception_dict, json.loads(response.content))
         self.assertIn('application/json', response['Content-Type'])