Commit 9d246a3e authored by Scott Vokes's avatar Scott Vokes
Browse files

Merge remote-tracking branch 'origin/develop' into develop

parents f31f0021 1b010235

src/lib/kinetic_operation.c

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ KineticStatus KineticOperation_SendRequest(KineticOperation* const operation) 
    else {

        header.valueLength = 0;

    }

    KineticLogger_LogHeader(1, &header);

    KineticLogger_LogHeader(2, &header);



    uint32_t nboProtoLength = KineticNBO_FromHostU32(header.protobufLength);

    uint32_t nboValueLength = KineticNBO_FromHostU32(header.valueLength);
@@ -136,7 +136,7 @@ KineticStatus KineticOperation_SendRequest(KineticOperation* const operation) 


    // Send the value/payload, if specified

    if (header.valueLength > 0) {

        LOGF1("Sending PDU Value Payload (%zu bytes)", operation->entry->value.bytesUsed);

        LOGF2("Sending PDU Value Payload (%zu bytes)", operation->entry->value.bytesUsed);

        memcpy(&msg[offset], operation->entry->value.array.data, operation->entry->value.bytesUsed);

        offset += operation->entry->value.bytesUsed;

    }

test/support/system_test_fixture.c

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ void SystemTestSetup(SystemTestFixture* fixture, int log_level) 
    }



    // Erase the drive

    status = KineticClient_InstantSecureErase(&fixture->session);

    TEST_ASSERT_EQUAL_KineticStatus(KINETIC_STATUS_SUCCESS, status);

    // status = KineticClient_InstantSecureErase(&fixture->session);

    // TEST_ASSERT_EQUAL_KineticStatus(KINETIC_STATUS_SUCCESS, status);



    // TEST_ASSERT_EQUAL_MESSAGE(

    //     fixture->expectedSequence,