Tests passing

Conflicts:
	celery/app/base.py
	celery/tests/app/test_app.py

celery/app/base.py

@@ -481,17 +481,14 @@ class Celery(object):
             self.on_configure()
         if self._config_source:
             self.loader.config_from_object(self._config_source)
+        defaults = dict(deepcopy(DEFAULTS), **self._preconf)
         self.configured = True
         s = Settings({}, [self.prepare_config(self.loader.conf),
-                          deepcopy(DEFAULTS)])
-
+                          defaults])
         # load lazy config dict initializers.
         pending = self._pending_defaults
         while pending:
             s.add_defaults(maybe_evaluate(pending.popleft()()))
-        if self._preconf:
-            for key, value in items(self._preconf):
-                setattr(s, key, value)
         self.on_after_configure.send(sender=self, source=s)
         return s
 

celery/tests/app/test_app.py

@@ -432,12 +432,11 @@ class test_App(AppCase):
                              {'foo': 'bar'})
 
     def test_compat_setting_CELERY_BACKEND(self):
-        self.app.conf.defaults[0]['CELERY_RESULT_BACKEND'] = None
+        self.app._preconf = {}  # removes result backend set by AppCase
         self.app.config_from_object(Object(CELERY_BACKEND='set_by_us'))
         self.assertEqual(self.app.conf.CELERY_RESULT_BACKEND, 'set_by_us')
 
     def test_setting_BROKER_TRANSPORT_OPTIONS(self):
-
         _args = {'foo': 'bar', 'spam': 'baz'}
 
         self.app.config_from_object(Object())