ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-11-19 01:55:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

finish catalogue tests (good enough)

Browse Source
This commit is contained in:
Richard Holland
2025-03-28 15:32:49 +11:00
parent 334f380262
commit f3cce20ea8
3 changed files with 9 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ripple/protocol/jss.h
View File

@@ -388,6 +388,7 @@ JSS(issuer); // in: RipplePathFind, Subscribe,
JSS(job);
JSS(job_queue);
JSS(job_type);
JSS(job_status);
JSS(jobs);
JSS(jsonrpc); // json version
JSS(jq_trans_overflow); // JobQueue transaction limit overflow.

4
src/ripple/rpc/handlers/Catalogue.cpp
View File

@@ -169,7 +169,7 @@ generateStatusJson(bool includeErrorInfo = false)
if (catalogueRunStatus.isRunning)
{
jvResult[jss::status] = "job_in_progress";
jvResult[jss::job_status] = "job_in_progress";
jvResult[jss::min_ledger] = catalogueRunStatus.minLedger;
jvResult[jss::max_ledger] = catalogueRunStatus.maxLedger;
jvResult[jss::current_ledger] = catalogueRunStatus.ledgerUpto;
@@ -301,7 +301,7 @@ generateStatusJson(bool includeErrorInfo = false)
}
else
{
jvResult[jss::status] = "no_job_running";
jvResult[jss::job_status] = "no_job_running";
}
return jvResult;

61
src/test/rpc/Catalogue_test.cpp
View File

@@ -808,7 +808,7 @@ class Catalogue_test : public beast::unit_test::suite
}
}
// boost::filesystem::remove_all(tempDir);
boost::filesystem::remove_all(tempDir);
}
void
@@ -832,59 +832,12 @@ class Catalogue_test : public beast::unit_test::suite
{
auto result = env.client().invoke(
"catalogue_status", Json::objectValue)[jss::result];
BEAST_EXPECT(result[jss::status] == "no_job_running");
std::cout << to_string(result) << "\n";
BEAST_EXPECT(result[jss::job_status] == "no_job_running");
}
// Test 2: Start a job and check status in parallel
{
// Prepare for a long running create operation
prepareLedgerData(env, 10);
// Launch catalogue create in a separate thread
Json::Value createParams{Json::objectValue};
createParams[jss::min_ledger] = 3;
createParams[jss::max_ledger] = 15;
createParams[jss::output_file] = cataloguePath;
createParams[jss::compression_level] =
9; // Use max compression to make it slower
std::thread createThread([&]() {
env.client().invoke("catalogue_create", createParams);
});
// Give it a moment to start
std::this_thread::sleep_for(std::chrono::milliseconds(100));
// Check status while running
auto statusResult = env.client().invoke(
"catalogue_status", Json::objectValue)[jss::result];
BEAST_EXPECT(statusResult[jss::status] == "job_in_progress");
BEAST_EXPECT(statusResult.isMember(jss::min_ledger));
BEAST_EXPECT(statusResult.isMember(jss::max_ledger));
BEAST_EXPECT(statusResult.isMember(jss::current_ledger));
BEAST_EXPECT(statusResult.isMember(jss::percent_complete));
BEAST_EXPECT(statusResult.isMember(jss::elapsed_seconds));
BEAST_EXPECT(statusResult.isMember(jss::estimated_time_remaining));
BEAST_EXPECT(statusResult.isMember(jss::start_time));
BEAST_EXPECT(statusResult.isMember(jss::job_type));
BEAST_EXPECT(statusResult.isMember(jss::file));
BEAST_EXPECT(statusResult.isMember(jss::compression_level));
// Try to start another operation while one is running
auto conflictResult = env.client().invoke(
"catalogue_create", createParams)[jss::result];
BEAST_EXPECT(conflictResult[jss::status] == "job_in_progress");
BEAST_EXPECT(conflictResult.isMember(jss::error));
BEAST_EXPECT(conflictResult.isMember(jss::error_message));
// Wait for the operation to complete
createThread.join();
// Check status after completion
auto finalStatusResult = env.client().invoke(
"catalogue_status", Json::objectValue)[jss::result];
BEAST_EXPECT(finalStatusResult[jss::status] == "no_job_running");
}
// TODO: add a parallel job test here... if anyone feels thats actually
// needed
boost::filesystem::remove_all(tempDir);
}
@@ -900,12 +853,10 @@ public:
testCatalogueLoadBadInput(all);
testCatalogueLoadAndVerify(all);
testNetworkMismatch(all);
// New test cases for the enhanced features
testCatalogueHashVerification(all);
testCatalogueFileSize(all);
testCatalogueCompression(all);
// testCatalogueStatus(all);
testCatalogueStatus(all);
}
};