Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Attempt to use xclient_zmq for the debugger_client #627

Merged
merged 4 commits into from
Jul 11, 2024
Merged

Attempt to use xclient_zmq for the debugger_client #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92fa0e9
Attempt to use xclient_zmq for the debugger_client
anutosh491 Jun 6, 2024
6afbc1a
add todo for test_rich_inspect_variables
anutosh491 Jul 3, 2024
a76942a
minor changes
anutosh491 Jul 3, 2024
bd83346
disconnect before shutdown
anutosh491 Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ jobs:
- name: Print version
run: xpython --version

# - name: Test xeus-python C++
# run: ./test_xeus_python
# timeout-minutes: 4
# working-directory: build/test
- name: Test xeus-python C++
run: ./test_xeus_python
timeout-minutes: 4
working-directory: build/test

- name: Test xeus-python Python
run: pytest . -vvv
Expand Down
8 changes: 5 additions & 3 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,15 @@ include_directories(${GTEST_INCLUDE_DIRS} SYSTEM)
set(XEUS_PYTHON_TESTS
main.cpp
../src/xutils.cpp
#test_debugger.cpp
#xeus_client.hpp
#xeus_client.cpp
test_debugger.cpp
xeus_client.hpp
xeus_client.cpp
)

add_executable(test_xeus_python ${XEUS_PYTHON_TESTS})

target_compile_features(test_xeus_python PRIVATE cxx_std_17)

if (APPLE)
set_target_properties(test_xeus_python PROPERTIES
MACOSX_RPATH ON
Expand Down
127 changes: 89 additions & 38 deletions test/test_debugger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

#include "xeus_client.hpp"

#include "xeus-zmq/xzmq_context.hpp"

#include "pybind11/pybind11.h"

#include <stdio.h>
Expand Down Expand Up @@ -400,7 +402,9 @@ class debugger_client
bool test_rich_inspect_variables();
bool test_variables();
bool test_copy_to_globals();
void start();
void shutdown();
void disconnect_debugger();

private:

Expand Down Expand Up @@ -519,9 +523,6 @@ bool debugger_client::test_set_exception_breakpoints()
nl::json ev = m_client.wait_for_debug_event("stopped");
std::string reason = ev["content"]["body"]["reason"].get<std::string>();

m_client.send_on_control("debug_request", make_disconnect_request(6));
nl::json rep = m_client.receive_on_control();

return reason == "exception";
}

Expand Down Expand Up @@ -965,8 +966,24 @@ bool debugger_client::test_copy_to_globals()
return global_var["value"] == local_var["value"] && global_var["type"] == local_var["type"];
}

void debugger_client::start()
{
m_client.start();
}

void debugger_client::disconnect_debugger()
{
m_client.send_on_control("debug_request", make_disconnect_request(INT_MAX));
m_client.receive_on_control();
}

void debugger_client::shutdown()
{
if (m_client.kernel_dead)
{
throw std::runtime_error("Kernel is not alive. Cannot send shutdown request.");
}
m_client.stop_channels();
m_client.send_on_control("shutdown_request", make_shutdown_request());
m_client.receive_on_control();
}
Expand Down Expand Up @@ -1144,10 +1161,12 @@ TEST_SUITE("debugger")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_init.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_init.log");
deb.start();
bool res = deb.test_init();
deb.disconnect_debugger();
deb.shutdown();
std::this_thread::sleep_for(2s);
CHECK(res);
Expand All @@ -1159,9 +1178,10 @@ TEST_SUITE("debugger")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_disconnect.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_disconnect.log");
deb.start();
bool res = deb.test_disconnect();
deb.shutdown();
std::this_thread::sleep_for(2s);
Expand All @@ -1174,10 +1194,12 @@ TEST_SUITE("debugger")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_attach.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_attach.log");
deb.start();
bool res = deb.test_attach();
deb.disconnect_debugger();
deb.shutdown();
std::this_thread::sleep_for(2s);
CHECK(res);
Expand All @@ -1189,9 +1211,10 @@ TEST_SUITE("debugger")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_multi_session.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_multi_session.log");
deb.start();
bool res1 = deb.test_disconnect();
std::this_thread::sleep_for(2s);
bool res2 = deb.test_disconnect();
Expand All @@ -1207,10 +1230,12 @@ TEST_SUITE("debugger")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_set_external_breakpoints.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_set_external_breakpoints.log");
deb.start();
bool res = deb.test_external_set_breakpoints();
deb.disconnect_debugger();
deb.shutdown();
std::this_thread::sleep_for(2s);
CHECK(res);
Expand All @@ -1222,10 +1247,12 @@ TEST_SUITE("debugger")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_external_next_continue.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_external_next_continue.log");
deb.start();
bool res = deb.test_external_next_continue();
deb.disconnect_debugger();
deb.shutdown();
std::this_thread::sleep_for(2s);
CHECK(res);
Expand All @@ -1237,10 +1264,12 @@ TEST_SUITE("debugger")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_set_breakpoints.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_set_breakpoints.log");
deb.start();
bool res = deb.test_set_breakpoints();
deb.disconnect_debugger();
deb.shutdown();
std::this_thread::sleep_for(2s);
CHECK(res);
Expand All @@ -1252,10 +1281,12 @@ TEST_SUITE("debugger")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_set_exception_breakpoints.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_set_exception_breakpoints.log");
deb.start();
bool res = deb.test_set_exception_breakpoints();
deb.disconnect_debugger();
deb.shutdown();
std::this_thread::sleep_for(5s);
CHECK(res);
Expand All @@ -1267,10 +1298,12 @@ TEST_SUITE("debugger")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_source.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_source.log");
deb.start();
bool res = deb.test_source();
deb.disconnect_debugger();
deb.shutdown();
std::this_thread::sleep_for(2s);
CHECK(res);
Expand All @@ -1282,10 +1315,12 @@ TEST_SUITE("debugger")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_next_continue.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_next_continue.log");
deb.start();
bool res = deb.test_next_continue();
deb.disconnect_debugger();
deb.shutdown();
std::this_thread::sleep_for(2s);
CHECK(res);
Expand All @@ -1297,10 +1332,12 @@ TEST_SUITE("debugger")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_stepin.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_stepin.log");
deb.start();
bool res = deb.test_step_in();
deb.disconnect_debugger();
deb.shutdown();
std::this_thread::sleep_for(2s);
CHECK(res);
Expand All @@ -1312,10 +1349,12 @@ TEST_SUITE("debugger")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_stack_trace.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_stack_trace.log");
deb.start();
bool res = deb.test_stack_trace();
deb.disconnect_debugger();
deb.shutdown();
std::this_thread::sleep_for(2s);
CHECK(res);
Expand All @@ -1327,10 +1366,12 @@ TEST_SUITE("debugger")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_debug_info.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_debug_info.log");
deb.start();
bool res = deb.test_debug_info();
deb.disconnect_debugger();
deb.shutdown();
std::this_thread::sleep_for(2s);
CHECK(res);
Expand All @@ -1342,40 +1383,48 @@ TEST_SUITE("debugger")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_inspect_variables.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_inspect_variables.log");
deb.start();
bool res = deb.test_inspect_variables();
deb.disconnect_debugger();
deb.shutdown();
std::this_thread::sleep_for(2s);
CHECK(res);
t.notify_done();
}
}

// TODO: Get test_rich_inspect_variables to work
/*
TEST_CASE("rich_inspect_variables")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_rich_inspect_variables.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_rich_inspect_variables.log");
deb.start();
bool res = deb.test_rich_inspect_variables();
deb.shutdown();
std::this_thread::sleep_for(2s);
CHECK(res);
t.notify_done();
}
}
*/

TEST_CASE("variables")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_variables.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_variables.log");
deb.start();
bool res = deb.test_variables();
deb.disconnect_debugger();
deb.shutdown();
std::this_thread::sleep_for(2s);
CHECK(res);
Expand All @@ -1387,14 +1436,16 @@ TEST_SUITE("debugger")
{
start_kernel();
timer t;
xeus::xcontext context;
auto context_ptr = xeus::make_zmq_context();
{
debugger_client deb(context, KERNEL_JSON, "debugger_copy_to_globals.log");
debugger_client deb(*context_ptr, KERNEL_JSON, "debugger_copy_to_globals.log");
deb.start();
bool res = deb.test_copy_to_globals();
deb.disconnect_debugger();
deb.shutdown();
std::this_thread::sleep_for(2s);
CHECK(res);
t.notify_done();
}
}
}
}
Loading