Set unique exit codes for processes

3 files changed, 15 insertions, 5 deletions

diff --git a/test/subprocesstest.py b/test/subprocesstest.py
index 02422a6cba..78db95aed0 100644
--- a/test/subprocesstest.py
+++ b/test/subprocesstest.py
@@ -118,8 +118,18 @@ class SubprocessTestCase(unittest.TestCase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.exit_ok = 0
+
+        # See ui/exit_codes.h
         self.exit_command_line = 1
-        self.exit_error = 2
+        self.exit_invalid_interface = 2
+        self.exit_invalid_file_error = 3
+        self.exit_invalid_filter_error = 4
+        self.exit_invalid_capability = 5
+        self.exit_iface_no_link_types = 6
+        self.exit_iface_has_no_timestamp_types = 7
+        self.exit_init_failed = 8
+        self.exit_open_error = 9
+
         self.exit_code = None
         self.log_fname = None
         self.log_fd = None
diff --git a/test/suite_clopts.py b/test/suite_clopts.py
index b0a17b1f49..553c1dad47 100644
--- a/test/suite_clopts.py
+++ b/test/suite_clopts.py
@@ -39,7 +39,7 @@ class case_dumpcap_options(subprocesstest.SubprocessTestCase):
     # XXX Should we generate individual test functions instead of looping?
     def test_dumpcap_interface_chars(self, cmd_dumpcap, base_env):
         '''Valid dumpcap parameters requiring capture permissions'''
-        valid_returns = [self.exit_ok, self.exit_error]
+        valid_returns = [self.exit_ok, self.exit_invalid_interface]
         for char_arg in 'DL':
             process = self.runProcess((cmd_dumpcap, '-' + char_arg), env=base_env)
             self.assertIn(process.returncode, valid_returns)
@@ -83,7 +83,7 @@ class case_basic_clopts(subprocesstest.SubprocessTestCase):
     def test_nonexistent_file(self, cmd_tshark, capture_file):
         # $TSHARK - r ThisFileDontExist.pcap > ./testout.txt 2 > &1
         self.assertRun((cmd_tshark, '-r', capture_file('__ceci_nest_pas_une.pcap')),
-                       expected_return=self.exit_error)
+                       expected_return=self.exit_invalid_file_error)
 
 
 @fixtures.mark_usefixtures('test_env')
@@ -105,7 +105,7 @@ class case_tshark_options(subprocesstest.SubprocessTestCase):
     def test_tshark_interface_chars(self, cmd_tshark, cmd_dumpcap):
         '''Valid tshark parameters requiring capture permissions'''
         # These options require dumpcap
-        valid_returns = [self.exit_ok, self.exit_error]
+        valid_returns = [self.exit_ok, self.exit_invalid_capability]
         for char_arg in 'DL':
             process = self.runProcess((cmd_tshark, '-' + char_arg))
             self.assertIn(process.returncode, valid_returns)
diff --git a/test/suite_dfilter/dfiltertest.py b/test/suite_dfilter/dfiltertest.py
index ca2f9860be..9a0accc41f 100644
--- a/test/suite_dfilter/dfiltertest.py
+++ b/test/suite_dfilter/dfiltertest.py
@@ -75,7 +75,7 @@ def checkDFilterFail(cmd_dftest, base_env):
         outs, errs = proc.communicate()
         assert error_message in errs, \
             'Unexpected dftest stderr:\n%s\nstdout:\n%s' % (errs, outs)
-        assert proc.returncode == 2, \
+        assert proc.returncode == 4, \
             'Unexpected dftest exit code: %d. stdout:\n%s\n' % \
             (proc.returncode, outs)
     return checkDFilterFail_real