Replace magic numbers with errno constants

Author: mnaberez

supervisor/tests/base.py

@@ -1,7 +1,9 @@
 _NOW = 1151365354
 _TIMEFORMAT = '%b %d %I:%M %p'
 
-from functools import total_ordering
+import errno
+import functools
+import os
 
 from supervisor.compat import Fault
 from supervisor.compat import as_bytes
@@ -215,7 +217,7 @@ def _exit(self, code):
     def execve(self, filename, argv, environment):
         self.execve_called = True
         if self.execv_error:
-            if self.execv_error == 1:
+            if self.execv_error == errno.EPERM:
                 raise OSError(self.execv_error)
             else:
                 raise RuntimeError(self.execv_error)
@@ -374,7 +376,7 @@ def config(self):
     def get_socket(self):
         return DummySocket(self._config.fd)
 
-@total_ordering
+@functools.total_ordering
 class DummyProcess(object):
     # Initial state; overridden by instance variables
     pid = 0 # Subprocess pid; 0 when not running
@@ -1040,7 +1042,7 @@ def __init__(self, options, name='whatever', priority=999, pconfigs=None, socket
         DummyPGroupConfig.__init__(self, options, name, priority, pconfigs)
         self.socket_config = socket_config
 
-@total_ordering
+@functools.total_ordering
 class DummyProcessGroup(object):
     def __init__(self, config):
         self.config = config

supervisor/tests/test_process.py

@@ -250,7 +250,7 @@ def test_spawn_fail_make_pipes_emfile(self):
 
     def test_spawn_fail_make_pipes_other(self):
         options = DummyOptions()
-        options.make_pipes_error = 1
+        options.make_pipes_error = errno.EPERM
         config = DummyPConfig(options, 'good', '/good/filename')
         instance = self._makeOne(config)
         from supervisor.states import ProcessStates
@@ -327,7 +327,7 @@ def test_spawn_fork_fail_eagain(self):
 
     def test_spawn_fork_fail_other(self):
         options = DummyOptions()
-        options.fork_error = 1
+        options.fork_error = errno.EPERM
         config = DummyPConfig(options, 'good', '/good/filename')
         instance = self._makeOne(config)
         from supervisor.states import ProcessStates
@@ -436,7 +436,7 @@ def test_spawn_as_child_sets_umask(self):
     def test_spawn_as_child_cwd_fail(self):
         options = DummyOptions()
         options.forkpid = 0
-        options.chdir_error = 2
+        options.chdir_error = errno.ENOENT
         config = DummyPConfig(options, 'good', '/good/filename',
                               directory='/tmp')
         instance = self._makeOne(config)
@@ -458,7 +458,7 @@ def test_spawn_as_child_cwd_fail(self):
     def test_spawn_as_child_execv_fail_oserror(self):
         options = DummyOptions()
         options.forkpid = 0
-        options.execv_error = 1
+        options.execv_error = errno.EPERM
         config = DummyPConfig(options, 'good', '/good/filename')
         instance = self._makeOne(config)
         result = instance.spawn()
@@ -477,7 +477,7 @@ def test_spawn_as_child_execv_fail_oserror(self):
     def test_spawn_as_child_execv_fail_runtime_error(self):
         options = DummyOptions()
         options.forkpid = 0
-        options.execv_error = 2
+        options.execv_error = errno.ENOENT
         config = DummyPConfig(options, 'good', '/good/filename')
         instance = self._makeOne(config)
         result = instance.spawn()
@@ -815,7 +815,7 @@ def test_kill_nopid(self):
     def test_kill_error(self):
         options = DummyOptions()
         config = DummyPConfig(options, 'test', '/test')
-        options.kill_error = 1
+        options.kill_error = errno.EPERM
         instance = self._makeOne(config)
         L = []
         from supervisor.states import ProcessStates
@@ -1000,7 +1000,7 @@ def kill(pid, sig):
     def test_signal_error(self):
         options = DummyOptions()
         config = DummyPConfig(options, 'test', '/test')
-        options.kill_error = 1
+        options.kill_error = errno.EPERM
         instance = self._makeOne(config)
         L = []
         from supervisor.states import ProcessStates