external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Migrate is_never_timeout to utility.

Browse source
This commit is contained in:
winlin 2019-05-09 08:42:53 +08:00
parent 1b37b90b8f
commit ccba55cdd8
8 changed files with 8 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/utest/srs_utest_protocol.cpp
View file

@ -43,11 +43,6 @@ MockEmptyIO::~MockEmptyIO()
{
}
bool MockEmptyIO::is_never_timeout(srs_utime_t /*tm*/)
{
return true;
}
srs_error_t MockEmptyIO::read_fully(void* /*buf*/, size_t /*size*/, ssize_t* /*nread*/)
{
return srs_success;
@ -112,11 +107,6 @@ MockBufferIO* MockBufferIO::append(string data)
return this;
}
bool MockBufferIO::is_never_timeout(srs_utime_t tm)
{
return tm == SRS_UTIME_NO_TIMEOUT;
}
srs_error_t MockBufferIO::read_fully(void* buf, size_t size, ssize_t* nread)
{
if (in_buffer.length() < (int)size) {

6
trunk/src/utest/srs_utest_protocol.hpp
View file

@ -46,9 +46,6 @@ class MockEmptyIO : public ISrsProtocolReadWriter
public:
MockEmptyIO();
virtual ~MockEmptyIO();
// for protocol
public:
virtual bool is_never_timeout(srs_utime_t tm);
// for handshake.
public:
virtual srs_error_t read_fully(void* buf, size_t size, ssize_t* nread);
@ -87,9 +84,6 @@ public:
virtual ~MockBufferIO();
public:
virtual MockBufferIO* append(std::string data);
// for protocol
public:
virtual bool is_never_timeout(srs_utime_t tm);
// for handshake.
public:
virtual srs_error_t read_fully(void* buf, size_t size, ssize_t* nread);

3
trunk/src/utest/srs_utest_service.cpp
View file

@ -39,6 +39,9 @@ VOID TEST(ServiceTimeTest, TimeUnit)
EXPECT_EQ(1000*1000, SRS_UTIME_SECONDS);
EXPECT_EQ(60*1000*1000, SRS_UTIME_MINUTES);
EXPECT_EQ(3600*1000*1000LL, SRS_UTIME_HOURS);
EXPECT_TRUE(srs_is_never_timeout(SRS_UTIME_NO_TIMEOUT));
EXPECT_FALSE(srs_is_never_timeout(0));
}
#define MOCK_LISTEN_HOST "127.0.0.1"