merged back async_io branch into trunk

2007-06-10 20:46:09 +00:00
parent 36031f82ed
commit 3b8670626a
45 changed files with 1532 additions and 831 deletions
--- a/test/test_metadata_extension.cpp
+++ b/test/test_metadata_extension.cpp
@@ -40,7 +40,7 @@ void test_transfer(bool clear_files = true, bool disconnect = false)

 		if (disconnect && tor2.is_valid()) ses2.remove_torrent(tor2);
 		if (!disconnect && tor2.has_metadata()) break;
-		sleep(100);
+		test_sleep(100);
 	}

 	if (disconnect) return;
@@ -52,7 +52,7 @@ void test_transfer(bool clear_files = true, bool disconnect = false)
 	{
 		tor2.status();
 		if (tor2.is_seed()) break;
-		sleep(100);
+		test_sleep(100);
 	}

 	TEST_CHECK(tor2.is_seed());