Permalink
Browse files

Tests: Don't hardcode errno constants

The values of ENOENT and ESRCH are architecture-dependent, so don't
assume they're always 2 and 3.
  • Loading branch information...
jwilk authored and pbeckingham committed Feb 17, 2018
1 parent 59342bc commit 23d63ccb44e98b9d2c3458750691a0ae1daa44ff
Showing with 10 additions and 6 deletions.
  1. +3 −2 test/basetest/hooks.py
  2. +2 −1 test/basetest/task.py
  3. +2 −1 test/basetest/taskd.py
  4. +3 −2 test/basetest/utils.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-

from __future__ import division
import errno
import os
from sys import stderr
import shutil
@@ -144,7 +145,7 @@ def clear(self):
shutil.rmtree(self.hookdir)
except OSError as e:
# If the hookdir folder doesn't exist, no harm done and keep going
if e.errno != 2:
if e.errno != errno.ENOENT:
raise

os.mkdir(self.hookdir)
@@ -258,7 +259,7 @@ def _remove_file(self, file):
try:
os.remove(file)
except OSError as e:
if e.errno == 2:
if e.errno == errno.ENOENT:
raise HookError("Hook with name {0} was not found on "
"hooks/ folder".format(file))
else:
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-

import atexit
import errno
import json
import os
import shlex
@@ -274,7 +275,7 @@ def destroy(self):
try:
shutil.rmtree(self.datadir)
except OSError as e:
if e.errno == 2:
if e.errno == errno.ENOENT:
# Directory no longer exists
pass
else:
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-

from __future__ import division, print_function
import errno
import os
import tempfile
import shutil
@@ -310,7 +311,7 @@ def destroy(self):
try:
shutil.rmtree(self.datadir)
except OSError as e:
if e.errno == 2:
if e.errno == errno.ENOENT:
# Directory no longer exists
pass
else:
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
from __future__ import division
import errno
import os
import sys
import socket
@@ -212,8 +213,8 @@ def _get_output(arguments, timeout=None):
try:
os.kill(pid, signal.SIGABRT)
except OSError as e:
# 3 means the process finished/died between last check and now
if e.errno != 3:
# ESRCH means the process finished/died between last check and now
if e.errno != errno.ESRCH:
raise

# Wait for process to finish (should die/exit after signal)

0 comments on commit 23d63cc

Please sign in to comment.