Commit edd30e50 authored by Greg Williams's avatar Greg Williams
Browse files

Fixed system test fixture integration issues. 

Fixed some complier warnings.
parent bc36b3e1

src/examples/put_nonblocking.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ int main(int argc, char** argv) 
    if (client == NULL) { return 1; }

    const char HmacKeyString[] = "asdfasdf";

    KineticSessionConfig config = {

        .host = SYSTEM_TEST_HOST,

        .host = "127.0.0.1",

        .port = KINETIC_PORT,

        .clusterVersion = 0,

        .identity = 1,

src/lib/kinetic_operation.c

+5 −1
Original line number Diff line number Diff line
@@ -61,7 +61,11 @@ KineticStatus KineticOperation_SendRequest(KineticOperation* const operation) 


static void log_request_seq_id(int fd, int64_t seq_id, KineticMessageType mt)

{

    #ifndef TEST

    #ifdef TEST

    (void)fd;

    (void)seq_id;

    (void)mt;

    #else

    #if KINETIC_LOGGER_LOG_SEQUENCE_ID

    struct timeval tv;

    gettimeofday(&tv, NULL);

test/support/system_test_fixture.c

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void LoadConfiguration(void) 
    }

}



const char* GetSystemTestHost1(void)

char* GetSystemTestHost1(void)

{

    LoadConfiguration();

    return Fixture.host1;
@@ -140,7 +140,7 @@ int GetSystemTestTlsPort1(void) 
    return Fixture.tlsPort1;

}



const char* GetSystemTestHost2(void)

char* GetSystemTestHost2(void)

{

    LoadConfiguration();

    return Fixture.host2;

test/support/system_test_fixture.h

+2 −2
Original line number Diff line number Diff line
@@ -66,10 +66,10 @@ void SystemTestSetupWithIdentity(int log_level, int64_t identity, 
    const uint8_t *key, size_t key_size);

void SystemTestShutDown(void);

bool SystemTestIsUnderSimulator(void);

const char* GetSystemTestHost1(void);

char* GetSystemTestHost1(void);

int GetSystemTestPort1(void);

int GetSystemTestTlsPort1(void);

const char* GetSystemTestHost2(void);

char* GetSystemTestHost2(void);

int GetSystemTestPort2(void);

int GetSystemTestTlsPort2(void);

test/system/test_system_bus.c

+2 −2
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ void test_that_we_can_register_sockets(void) 
    socket_info * si = calloc(1, sizeof(socket_info) + 2 * PDU_PROTO_MAX_LEN);

    assert(si != NULL);



    int fd = KineticSocket_Connect(SYSTEM_TEST_HOST, KINETIC_PORT);

    int fd = KineticSocket_Connect(GetSystemTestHost1(), GetSystemTestPort1());

    assert(fd != KINETIC_SOCKET_DESCRIPTOR_INVALID);

    bool result = bus_register_socket(res.bus, BUS_SOCKET_PLAIN, fd, si);

    assert(result);
@@ -294,7 +294,7 @@ void test_that_we_can_register_SSL_sockets(void) 
    socket_info * si = calloc(1, sizeof(socket_info) + 2 * PDU_PROTO_MAX_LEN);

    assert(si != NULL);



    int fd = KineticSocket_Connect(SYSTEM_TEST_HOST, KINETIC_TLS_PORT);

    int fd = KineticSocket_Connect(GetSystemTestHost1(), GetSystemTestTlsPort1());

    assert(fd != KINETIC_SOCKET_DESCRIPTOR_INVALID);

    bool result = bus_register_socket(res.bus, BUS_SOCKET_SSL, fd, si);

    assert(result);