diff --git a/ChangeLog b/ChangeLog
index d8325ccef1b3666f385f860009d4971aa78cbdf4..0c56651e13b5d49cd2e5474c1138fcd0747bdb0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2005-03-12  Per Cederqvist  <ceder@ingate.com>
+
+	Added more test cases.  Made the tests less likely to loop
+	forever.
+	* test/hello.sh: New file.
+	* test/tool.sh: New file.
+	* test/test_spawn.py: Import test.base instead of importing
+	unittest.  Removed top-level code -- use testdriver.py to run the
+	tests instead.
+	(TestSpawn): Inherit from test.base.TestCase.
+	(TestSpawn.test_spawn_sleep_1): Use assertTimeDiff instead of
+	assertAlmostEqual.
+	(TestSpawn.test_spawn_sleep_1_compat): Ditto.
+	(TestSpawn.test_hello_world): New test.
+	(TestSpawn.test_stderr): New test.
+	(TestSpawn.test_stderr_2): New test.
+	* test/test_popen.py: Import test.base instead of importing
+	unittest.  Removed top-level code -- use testdriver.py to run the
+	tests instead.
+	(TestPopen): Inherit from test.base.TestCase.  
+	(Timeout): Moved to test/base.py.
+	(handler): Ditto.
+	(TestPopen.setUp): Moved to test.base.TestCase.
+	(TestPopen.tearDown): Ditto.
+	(TestPopen.test_popen_sleep_1): Use assertTimeDiff instead of
+	assertAlmostEqual.
+	(TestPopen.test_popen_sleep_1_compat): Ditto.
+	(TestPopen.test_read_hello_no_eof_handling): New test.
+	(TestPopen.test_read_hello_no_eof_handling_no_exception): New
+	test.
+	* test/base.py (Timeout): New exception.
+	(handler): New signal handler.
+	(TestCase): New class.
+	(TestCase.setUp): New setup function.  Reset the state of
+	pcl_expect, and set up a SIGALRM timer.
+	(TestCase.tearDown): Cancel the SIGALRM timer.
+	(TestCase.progress): Re-arm the SIGALRM timer.
+	(TestCase.assertTimeDiff): New function.
+
+2005-03-02  Per Cederqvist  <ceder@ingate.com>
+
+	* test/test_environment.py: New tests.
+
 2005-01-19  Per Cederqvist  <ceder@ingate.com>
 
 	Added some test cases.