From 956990514235e0bccac79ccda060d8fff439ebe3 Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 10 Feb 2013 17:44:41 +0100
Subject: Fix race condition when tearing down test case

---
 miniircd | 2 +-
 test.py  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/miniircd b/miniircd
index f562b1e..a1b90b4 100755
--- a/miniircd
+++ b/miniircd
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # Hey, Emacs! This is -*-python-*-.
 #
-# Copyright (C) 2003, 2011-2012 Joel Rosdahl
+# Copyright (C) 2003, 2011-2013 Joel Rosdahl
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/test.py b/test.py
index 7b008fe..d8d6481 100644
--- a/test.py
+++ b/test.py
@@ -55,6 +55,7 @@ class ServerFixture(object):
 
     def shutDown(self):
         os.kill(self.child_pid, signal.SIGTERM)
+        os.waitpid(self.child_pid, 0)
         if self.state_dir:
             try:
                 shutil.rmtree(self.state_dir)
-- 
cgit v1.2.3