Commit 12c32dd2 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Add tests to exercise NORNSCTL_COMMAND_SHUTDOWN 

The duration of 'sleep phases' in dry run tasks can now be defined both
in the command line (by passing an integer with the number of usecs to
wait) and in tests (by using the dry_run_duration field in the
fake_daemon_cfg class).
parent 46db6047

lib/communication.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ send_control_command_request(nornsctl_command_t cmd, void* args) { 
        return NORNS_ESNAFU;

    }



    return NORNS_SUCCESS;

    return resp.r_error_code;

}

src/Makefile.am

+13 −12
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ config/defaults.cpp: Makefile 
	   echo ""; \

\

	   echo "    const bool dry_run               = false;"; \

	   echo "    const uint32_t dry_run_duration  = 100;"; \

\

	   echo "    const char* global_socket        = \"$(localstatedir)/global.socket.2\";"; \

	   echo "    const char* control_socket       = \"$(localstatedir)/control.socket.2\";"; \

src/config/defaults.hpp

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ namespace defaults { 
    extern const bfs::path  log_file;

    extern const uint32_t   log_file_max_size;

    extern const bool       dry_run;

    extern const uint32_t   dry_run_duration;

    extern const char*      global_socket;

    extern const char*      control_socket;

    extern const in_port_t  remote_port;

src/config/settings.cpp

+10 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ namespace config { 
settings::settings() { }

settings::settings(const std::string& progname, bool daemonize, bool use_syslog,

                   const bfs::path& log_file, const uint32_t log_file_max_size,

                   bool dry_run, const bfs::path& global_socket, 

                   bool dry_run, uint32_t dry_run_duration, 

                   const bfs::path& global_socket, 

                   const bfs::path& control_socket, uint32_t remote_port,

                   const bfs::path& pidfile, uint32_t workers, 

                   uint32_t backlog_size, const bfs::path& cfgfile,
@@ -58,6 +59,7 @@ settings::settings(const std::string& progname, bool daemonize, bool use_syslog, 
    m_log_file(log_file),

    m_log_file_max_size(log_file_max_size),

    m_dry_run(dry_run),

    m_dry_run_duration(dry_run_duration),

    m_global_socket(global_socket),

    m_control_socket(control_socket),

    m_remote_port(remote_port),
@@ -74,6 +76,7 @@ void settings::load_defaults() { 
    m_log_file = defaults::log_file;

    m_log_file_max_size = defaults::log_file_max_size;

    m_dry_run = defaults::dry_run;

    m_dry_run_duration = defaults::dry_run_duration;

    m_global_socket = defaults::global_socket;

    m_control_socket = defaults::control_socket;

    m_remote_port = defaults::remote_port;
@@ -106,6 +109,7 @@ void settings::load_from_file(const bfs::path& filename) { 
    }



    m_dry_run = gsettings.get_as<bool>(keywords::dry_run);

    m_dry_run_duration = defaults::dry_run_duration;

    m_global_socket = gsettings.get_as<bfs::path>(keywords::global_socket);

    m_control_socket = gsettings.get_as<bfs::path>(keywords::control_socket);

    m_remote_port = gsettings.get_as<uint32_t>(keywords::remote_port);
@@ -136,6 +140,7 @@ std::string settings::to_string() const { 
           "  m_log_file: "          + m_log_file.string() + ",\n" +

           "  m_log_file_max_size: " + std::to_string(m_log_file_max_size) + ",\n" +

           "  m_dry_run: "           + (m_dry_run ? "true" : "false") +  ",\n" +

           "  m_dry_run_duration: "  + std::to_string(m_dry_run_duration) +  ",\n" +

           "  m_global_socket: "     + m_global_socket.string() + ",\n" +

           "  m_control_socket: "    + m_control_socket.string() + ",\n" +

           "  m_remote_port: "       + std::to_string(m_remote_port) + ",\n" +
@@ -172,6 +177,10 @@ bool& settings::dry_run() { 
    return m_dry_run;

}



uint32_t& settings::dry_run_duration() {

    return m_dry_run_duration;

}



bfs::path& settings::global_socket() {

    return m_global_socket;

}

src/config/settings.hpp

+4 −1
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ struct settings { 
    settings();

    settings(const std::string& progname, bool daemonize, bool use_syslog,

             const bfs::path& log_file, const uint32_t log_file_max_size,

             bool dry_run, const bfs::path& global_socket, 

             bool dry_run, uint32_t dry_run_duration,

             const bfs::path& global_socket, 

             const bfs::path& control_socket, uint32_t remote_port,

             const bfs::path& pidfile, uint32_t workers, 

             uint32_t backlog_size, const bfs::path& cfgfile,
@@ -101,6 +102,7 @@ struct settings { 
    bfs::path& log_file();

    uint32_t& log_file_max_size();

    bool& dry_run();

    uint32_t& dry_run_duration();

    bfs::path& global_socket();

    bfs::path& control_socket();

    in_port_t& remote_port();
@@ -116,6 +118,7 @@ struct settings { 
    bfs::path   m_log_file = defaults::log_file;

    uint32_t    m_log_file_max_size = defaults::log_file_max_size;

    bool        m_dry_run = defaults::dry_run;

    uint32_t    m_dry_run_duration = defaults::dry_run_duration;

    bfs::path   m_global_socket = defaults::global_socket;

    bfs::path   m_control_socket = defaults::control_socket;

    in_port_t   m_remote_port = defaults::remote_port;