Commit 7e99a3f3 authored by Greg Williams's avatar Greg Williams
Browse files

Merged in develop to get test cleanup

parents 53911959 f8ef061f

include/kinetic_client.h

+0 −4
Original line number Diff line number Diff line
@@ -223,8 +223,4 @@ KineticStatus KineticClient_P2POperation(KineticSession const * const session, 
                                         KineticP2P_Operation* const p2pOp,

                                         KineticCompletionClosure* closure);



#ifdef TEST

#include "kinetic_types_internal.h"

#endif



#endif // _KINETIC_CLIENT_H

src/lib/bus/bus_types.h

+0 −4
Original line number Diff line number Diff line
@@ -237,8 +237,4 @@ typedef enum { 
    BUS_RESPONSE_FAILURE_HUP,

} bus_status_res_t;



#ifdef TEST

#include "bus_internal_types.h"

#endif



#endif

src/lib/kinetic_operation.c

+1 −1
Original line number Diff line number Diff line
@@ -214,11 +214,11 @@ KineticStatus KineticOperation_PutCallback(KineticOperation* const operation, Ki 
    assert(operation->connection != NULL);

    LOGF3("PUT callback w/ operation (0x%0llX) on connection (0x%0llX)",

        operation, operation->connection);

    assert(operation->response != NULL);

    assert(operation->entry != NULL);



    if (status == KINETIC_STATUS_SUCCESS)

    {

        assert(operation->response != NULL);

        // Propagate newVersion to dbVersion in metadata, if newVersion specified

        KineticEntry* entry = operation->entry;

        if (entry->newVersion.array.data != NULL && entry->newVersion.array.len > 0) {

test/support/unity_helper.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include "unity.h"

#include "unity_byte_array_helper.h"

#include "kinetic_types.h"

#include "kinetic_types_internal.h"

#include "bus_internal_types.h"

#include <stdio.h>

#include <string.h>