messed up the order of the default vars vs. the result vars.

celery/tests/test_conf.py

@@ -13,16 +13,16 @@ SETTING_VARS = (
         "DEFAULT_DAEMON_CONCURRENCY"),
     ("CELERYD_PID_FILE", "DAEMON_PID_FILE",
         "DEFAULT_DAEMON_PID_FILE"),
-    ("CELERYD_EMPTY_MSG_EMIT_EVERY", "DEFAULT_EMPTY_MSG_EMIT_EVERY",
-        "EMPTY_MSG_EMIT_EVERY"),
-    ("CELERYD_QUEUE_WAKEUP_AFTER", "DEFAULT_QUEUE_WAKEUP_AFTER",
-        "QUEUE_WAKEUP_AFTER"),
-    ("CELERYD_LOG_FILE", "DEFAULT_DAEMON_LOG_FILE",
-        "DAEMON_LOG_FILE"),
-    ("CELERYD_DAEMON_LOG_FORMAT", "DEFAULT_LOG_FMT",
-        "LOG_FORMAT"),
-    ("CELERY_TASK_META_USE_DB", "DEFAULT_TASK_META_USE_DB",
-        "TASK_META_USE_DB"),
+    ("CELERYD_EMPTY_MSG_EMIT_EVERY", "EMPTY_MSG_EMIT_EVERY",
+        "DEFAULT_EMPTY_MSG_EMIT_EVERY"),
+    ("CELERYD_QUEUE_WAKEUP_AFTER", "QUEUE_WAKEUP_AFTER",
+        "DEFAULT_QUEUE_WAKEUP_AFTER"),
+    ("CELERYD_LOG_FILE", "DAEMON_LOG_FILE",
+        "DEFAULT_DAEMON_LOG_FILE"),
+    ("CELERYD_DAEMON_LOG_FORMAT", "LOG_FORMAT",
+        "DEFAULT_LOG_FMT"),
+    ("CELERY_TASK_META_USE_DB", "TASK_META_USE_DB",
+        "DEFAULT_TASK_META_USE_DB"),
 )