From d5bb40ce9ee5aa96fe4b0297ee4f518fdf99c02b Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 28 Aug 2010 04:40:51 +0000 Subject: [PATCH] 2010-08-28 Tatsuhiro Tsujikawa Wait data arrives at clientSocket_ in FtpConnectionTest::testReceiveEpsvResponse(). * test/FtpConnectionTest.cc --- ChangeLog | 6 ++++++ test/FtpConnectionTest.cc | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5360782a..0e9ea789 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-08-28 Tatsuhiro Tsujikawa + + Wait data arrives at clientSocket_ in + FtpConnectionTest::testReceiveEpsvResponse(). + * test/FtpConnectionTest.cc + 2010-08-27 Tatsuhiro Tsujikawa Added bt-tracker and bt-exclude-tracker to -i list option. diff --git a/test/FtpConnectionTest.cc b/test/FtpConnectionTest.cc index 25c93453..601274b5 100644 --- a/test/FtpConnectionTest.cc +++ b/test/FtpConnectionTest.cc @@ -310,22 +310,27 @@ void FtpConnectionTest::testReceiveEpsvResponse() CPPUNIT_ASSERT_EQUAL((uint16_t)12000, port); serverSocket_->writeData("229 Success |||12000|)\r\n"); + waitRead(clientSocket_); CPPUNIT_ASSERT_EQUAL((unsigned int)229, ftp_->receiveEpsvResponse(port)); CPPUNIT_ASSERT_EQUAL((uint16_t)0, port); serverSocket_->writeData("229 Success (|||12000|\r\n"); + waitRead(clientSocket_); CPPUNIT_ASSERT_EQUAL((unsigned int)229, ftp_->receiveEpsvResponse(port)); CPPUNIT_ASSERT_EQUAL((uint16_t)0, port); serverSocket_->writeData("229 Success ()|||12000|\r\n"); + waitRead(clientSocket_); CPPUNIT_ASSERT_EQUAL((unsigned int)229, ftp_->receiveEpsvResponse(port)); CPPUNIT_ASSERT_EQUAL((uint16_t)0, port); serverSocket_->writeData("229 Success )(|||12000|)\r\n"); + waitRead(clientSocket_); CPPUNIT_ASSERT_EQUAL((unsigned int)229, ftp_->receiveEpsvResponse(port)); CPPUNIT_ASSERT_EQUAL((uint16_t)0, port); serverSocket_->writeData("229 Success )(||12000|)\r\n"); + waitRead(clientSocket_); CPPUNIT_ASSERT_EQUAL((unsigned int)229, ftp_->receiveEpsvResponse(port)); CPPUNIT_ASSERT_EQUAL((uint16_t)0, port); }