Kinesin/daggy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing unit tests, fixing cmake so make test works properly

Browse Source
This commit is contained in:
Ian Roddis
2022-02-04 12:36:15 -04:00
parent ea3f67f226
commit 61e392cba3
4 changed files with 9 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daggyd/tests/CMakeLists.txt
View File

@@ -6,4 +6,4 @@ add_executable(${PROJECT_NAME} main.cpp
) )
target_link_libraries(${PROJECT_NAME} libdaggyd libdaggy stdc++fs Catch2::Catch2 curl) target_link_libraries(${PROJECT_NAME} libdaggyd libdaggy stdc++fs Catch2::Catch2 curl)
add_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}) add_test(${PROJECT_NAME} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME})

2
daggyr/tests/CMakeLists.txt
View File

@@ -6,4 +6,4 @@ add_executable(${PROJECT_NAME} main.cpp
) )
target_link_libraries(${PROJECT_NAME} libdaggyr libdaggy stdc++fs Catch2::Catch2) target_link_libraries(${PROJECT_NAME} libdaggyr libdaggy stdc++fs Catch2::Catch2)
add_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}) add_test(${PROJECT_NAME} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME})

91
daggyr/tests/unit_server.cpp
View File

@@ -23,7 +23,8 @@ TEST_CASE("rest_endpoint", "[server_basic]")
const ssize_t maxCores = 10, maxMemoryMB = 1000; const ssize_t maxCores = 10, maxMemoryMB = 1000;
daggyr::Server server(listenSpec, maxCores, maxMemoryMB); GeneralLogger logger(std::cout, LogLevel::NONE);
daggyr::Server server(listenSpec, maxCores, maxMemoryMB, logger);
server.init(10); server.init(10);
server.start(); server.start();
@@ -70,19 +71,12 @@ TEST_CASE("rest_endpoint", "[server_basic]")
while (true) { while (true) {
std::this_thread::sleep_for(250ms); std::this_thread::sleep_for(250ms);
auto [code, doc] = JSON_HTTP_REQUEST(baseURL + "/v1/poll"); auto [code, attemptJSON] =
REQUIRE(doc.IsArray()); JSON_HTTP_REQUEST(baseURL + "/v1/task/0/sample_task");
if (doc.Size() == 0) if (code == HTTPCode::Not_Found)
continue; continue;
const auto &task = doc[0]; auto attempt = attemptRecordFromJSON(attemptJSON);
REQUIRE(task.HasMember("state"));
std::string state = task["state"].GetString();
if (state != "COMPLETED")
continue;
REQUIRE(task.HasMember("attempt"));
auto attempt = attemptRecordFromJSON(task["attempt"]);
REQUIRE(attempt.rc == 0); REQUIRE(attempt.rc == 0);
REQUIRE(attempt.outputLog == "hello world\n"); REQUIRE(attempt.outputLog == "hello world\n");
@@ -90,78 +84,5 @@ TEST_CASE("rest_endpoint", "[server_basic]")
} }
} }
SECTION("Task capacity changes")
{
std::string taskSpec =
R"({ "job": { "command": [ "/bin/sleep", "5" ], "cores": "1", "memoryMB": "100" } })";
auto getCapacity = [&]() -> daggy::executors::task::daggy_runner::Capacity {
daggy::executors::task::daggy_runner::Capacity cap;
auto [code, doc] = JSON_HTTP_REQUEST(baseURL + "/v1/capacity");
REQUIRE(doc.IsObject());
REQUIRE(doc.HasMember("current"));
const auto &cur = doc["current"];
REQUIRE(cur.IsObject());
REQUIRE(cur.HasMember("cores"));
REQUIRE(cur.HasMember("memoryMB"));
cap.cores = cur["cores"].GetInt64();
cap.memoryMB = cur["memoryMB"].GetInt64();
return cap;
};
auto preCap = getCapacity();
// Submit
{
auto response =
HTTP_REQUEST(baseURL + "/v1/task/0/sample_task", taskSpec, "POST");
REQUIRE(response.code == HTTPCode::Ok);
}
auto postCap = getCapacity();
REQUIRE(postCap.cores == preCap.cores - 1);
REQUIRE(postCap.memoryMB == preCap.memoryMB - 100);
// Ensure the current job is running
{
auto [code, doc] = JSON_HTTP_REQUEST(baseURL + "/v1/poll");
REQUIRE(doc.IsArray());
REQUIRE(doc.Size() > 0);
REQUIRE(doc[0].HasMember("state"));
REQUIRE(doc[0]["state"] != "COMPLETED");
}
// Stop it
{
auto [code, doc] =
JSON_HTTP_REQUEST(baseURL + "/v1/task/0/sample_task", "", "DELETE");
REQUIRE(code == HTTPCode::Ok);
}
// Grab it and ensure it was killed
while (true) {
auto [code, doc] = JSON_HTTP_REQUEST(baseURL + "/v1/poll");
REQUIRE(code == HTTPCode::Ok);
REQUIRE(doc.IsArray());
if (doc.Size() == 0)
continue;
const auto &task = doc[0];
REQUIRE(task.HasMember("state"));
std::string state = task["state"].GetString();
if (state != "COMPLETED")
continue;
REQUIRE(task.HasMember("attempt"));
auto attempt = attemptRecordFromJSON(task["attempt"]);
REQUIRE(attempt.rc != 0);
break;
}
}
server.shutdown(); server.shutdown();
} }

2
libdaggy/tests/CMakeLists.txt
View File

@@ -19,4 +19,4 @@ add_executable(${PROJECT_NAME} main.cpp
) )
target_link_libraries(${PROJECT_NAME} libdaggy stdc++fs Catch2::Catch2) target_link_libraries(${PROJECT_NAME} libdaggy stdc++fs Catch2::Catch2)
add_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}) add_test(${PROJECT_NAME} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME})