projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Add test suite for packets.h.
[openvswitch]
/
tests
/
test-daemon.py
diff --git
a/tests/test-daemon.py
b/tests/test-daemon.py
index 98a51658088717b3931130b4f75bde9f190dc979..386445d4434201aee064792a1aa271c036f1c972 100644
(file)
--- a/
tests/test-daemon.py
+++ b/
tests/test-daemon.py
@@
-13,13
+13,20
@@
# limitations under the License.
import getopt
# limitations under the License.
import getopt
+import signal
import sys
import time
import ovs.daemon
import ovs.util
import sys
import time
import ovs.daemon
import ovs.util
+def handler(signum, frame):
+ raise Exception("Signal handler called with %d" % signum)
+
def main(argv):
def main(argv):
+
+ signal.signal(signal.SIGHUP, handler)
+
try:
options, args = getopt.gnu_getopt(
argv[1:], 'b', ["bail", "help"] + ovs.daemon.LONG_OPTIONS)
try:
options, args = getopt.gnu_getopt(
argv[1:], 'b', ["bail", "help"] + ovs.daemon.LONG_OPTIONS)
@@
-63,4
+70,10
@@
Other options:
sys.exit(0)
if __name__ == '__main__':
sys.exit(0)
if __name__ == '__main__':
- main(sys.argv)
+ try:
+ main(sys.argv)
+ except SystemExit:
+ # Let system.exit() calls complete normally
+ raise
+ except:
+ sys.exit(ovs.daemon.RESTART_EXIT_CODE)