|
 |
4023d5f |
diff -Naur ddnet-17.4-orig/src/test/jobs.cpp ddnet-17.4/src/test/jobs.cpp
|
|
|
4023d5f |
--- ddnet-17.4-orig/src/test/jobs.cpp 2023-11-15 22:40:08.000000000 +0000
|
|
|
4023d5f |
+++ ddnet-17.4/src/test/jobs.cpp 2023-12-12 17:40:34.456515743 +0000
|
|
|
4023d5f |
@@ -67,54 +67,6 @@
|
|
 |
08ccf24 |
sphore_destroy(&sphore);
|
|
|
08ccf24 |
}
|
|
|
08ccf24 |
|
|
|
08ccf24 |
-TEST_F(Jobs, LookupHost)
|
|
|
08ccf24 |
-{
|
|
|
08ccf24 |
- static const char *HOST = "example.com";
|
|
|
08ccf24 |
- static const int NETTYPE = NETTYPE_ALL;
|
|
|
08ccf24 |
- auto pJob = std::make_shared<CHostLookup>(HOST, NETTYPE);
|
|
|
08ccf24 |
-
|
|
|
4023d5f |
- EXPECT_STREQ(pJob->Hostname(), HOST);
|
|
|
4023d5f |
- EXPECT_EQ(pJob->Nettype(), NETTYPE);
|
|
|
08ccf24 |
-
|
|
|
08ccf24 |
- Add(pJob);
|
|
|
08ccf24 |
- while(pJob->Status() != IJob::STATE_DONE)
|
|
|
08ccf24 |
- {
|
|
|
08ccf24 |
- // yay, busy loop...
|
|
|
08ccf24 |
- thread_yield();
|
|
|
08ccf24 |
- }
|
|
|
08ccf24 |
-
|
|
|
4023d5f |
- EXPECT_STREQ(pJob->Hostname(), HOST);
|
|
|
4023d5f |
- EXPECT_EQ(pJob->Nettype(), NETTYPE);
|
|
|
4023d5f |
- if(pJob->Result() == 0)
|
|
|
6b72109 |
- {
|
|
|
4023d5f |
- EXPECT_EQ(pJob->Addr().type & NETTYPE, pJob->Addr().type);
|
|
|
6b72109 |
- }
|
|
|
08ccf24 |
-}
|
|
|
08ccf24 |
-
|
|
|
12f6e23 |
-TEST_F(Jobs, LookupHostWebsocket)
|
|
|
12f6e23 |
-{
|
|
|
12f6e23 |
- static const char *HOST = "ws://example.com";
|
|
|
12f6e23 |
- static const int NETTYPE = NETTYPE_ALL;
|
|
|
12f6e23 |
- auto pJob = std::make_shared<CHostLookup>(HOST, NETTYPE);
|
|
|
12f6e23 |
-
|
|
|
4023d5f |
- EXPECT_STREQ(pJob->Hostname(), HOST);
|
|
|
4023d5f |
- EXPECT_EQ(pJob->Nettype(), NETTYPE);
|
|
|
12f6e23 |
-
|
|
|
12f6e23 |
- Add(pJob);
|
|
|
12f6e23 |
- while(pJob->Status() != IJob::STATE_DONE)
|
|
|
12f6e23 |
- {
|
|
|
12f6e23 |
- // yay, busy loop...
|
|
|
12f6e23 |
- thread_yield();
|
|
|
12f6e23 |
- }
|
|
|
12f6e23 |
-
|
|
|
4023d5f |
- EXPECT_STREQ(pJob->Hostname(), HOST);
|
|
|
4023d5f |
- EXPECT_EQ(pJob->Nettype(), NETTYPE);
|
|
|
4023d5f |
- if(pJob->Result() == 0)
|
|
|
6b72109 |
- {
|
|
|
4023d5f |
- EXPECT_EQ(pJob->Addr().type & NETTYPE_WEBSOCKET_IPV4, pJob->Addr().type);
|
|
|
6b72109 |
- }
|
|
|
12f6e23 |
-}
|
|
|
12f6e23 |
-
|
|
|
08ccf24 |
TEST_F(Jobs, Many)
|
|
|
08ccf24 |
{
|
|
|
08ccf24 |
std::atomic<int> ThreadsRunning(0);
|