Tests passing

Conflicts:
	celery/tests/bin/test_celeryd_detach.py

celery/tests/bin/test_celeryd_detach.py

@@ -25,7 +25,7 @@ if not IS_WINDOWS:
             detach('/bin/boo', ['a', 'b', 'c'], logfile='/var/log',
                    pidfile='/var/pid')
             detached.assert_called_with(
-                '/var/log', '/var/pid', None, None, 0, None, False,
+                '/var/log', '/var/pid', None, None, None, None, False,
                 after_forkers=False,
             )
             execv.assert_called_with('/bin/boo', ['/bin/boo', 'a', 'b', 'c'])
@@ -86,7 +86,7 @@ class test_Command(AppCase):
         self.assertTrue(exit.called)
         detach.assert_called_with(
             path=x.execv_path, uid=None, gid=None,
-            umask=0, fake=False, logfile='/var/log', pidfile='celeryd.pid',
+            umask=None, fake=False, logfile='/var/log', pidfile='celeryd.pid',
             working_directory=None,
             argv=x.execv_argv + [
                 '-c', '1', '-lDEBUG',

celery/tests/utils/test_platforms.py

@@ -372,7 +372,7 @@ if not platforms.IS_WINDOWS:
         @patch('os.dup2')
         def test_open(self, dup2, open, close, closer, umask, chdir,
                       _exit, setsid, fork):
-            x = DaemonContext(workdir='/opt/workdir')
+            x = DaemonContext(workdir='/opt/workdir', umask=0o22)
             x.stdfds = [0, 1, 2]
 
             fork.return_value = 0
@@ -385,7 +385,7 @@ if not platforms.IS_WINDOWS:
             self.assertFalse(_exit.called)
 
             chdir.assert_called_with(x.workdir)
-            umask.assert_called_with(x.umask)
+            umask.assert_called_with(0o22)
             self.assertTrue(dup2.called)
 
             fork.reset_mock()