From b4be76fec849e1abbc5d959672716f95c441d0ba Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Thu, 6 Apr 2023 11:03:39 -0700 Subject: [PATCH] Fixed AV in attestation tests (#4480) * Fixed AV in attestation tests * Fixed another test AV --- .../test/ut/tpmattestation_test.cpp | 5 ++++- sdk/core/azure-core-test/src/test_base.cpp | 15 +++++++++------ .../test/ut/transport_adapter_base_test.cpp | 7 +++++-- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/sdk/attestation/azure-security-attestation/test/ut/tpmattestation_test.cpp b/sdk/attestation/azure-security-attestation/test/ut/tpmattestation_test.cpp index c7a72698c..d8ba1c091 100644 --- a/sdk/attestation/azure-security-attestation/test/ut/tpmattestation_test.cpp +++ b/sdk/attestation/azure-security-attestation/test/ut/tpmattestation_test.cpp @@ -53,7 +53,10 @@ namespace Azure { namespace Security { namespace Attestation { namespace Test { virtual void TearDown() override { // Reset the attestation policy for this instance back to the default. - m_adminClient->ResetAttestationPolicy(AttestationType::Tpm); + if (m_adminClient) + { + m_adminClient->ResetAttestationPolicy(AttestationType::Tpm); + } // Make sure you call the base classes TearDown method to ensure recordings are made. TestBase::TearDown(); diff --git a/sdk/core/azure-core-test/src/test_base.cpp b/sdk/core/azure-core-test/src/test_base.cpp index 48efd8663..286fd1687 100644 --- a/sdk/core/azure-core-test/src/test_base.cpp +++ b/sdk/core/azure-core-test/src/test_base.cpp @@ -16,12 +16,15 @@ void Azure::Core::Test::TestBase::TearDown() { return; } - if (m_testProxy->IsRecordMode()) + if (m_testProxy) { - m_testProxy->StopPlaybackRecord(TestMode::RECORD); - } - if (m_testProxy->IsPlaybackMode()) - { - m_testProxy->StopPlaybackRecord(TestMode::PLAYBACK); + if (m_testProxy->IsRecordMode()) + { + m_testProxy->StopPlaybackRecord(TestMode::RECORD); + } + if (m_testProxy->IsPlaybackMode()) + { + m_testProxy->StopPlaybackRecord(TestMode::PLAYBACK); + } } } diff --git a/sdk/core/azure-core/test/ut/transport_adapter_base_test.cpp b/sdk/core/azure-core/test/ut/transport_adapter_base_test.cpp index 98b714908..f1ad6dca7 100644 --- a/sdk/core/azure-core/test/ut/transport_adapter_base_test.cpp +++ b/sdk/core/azure-core/test/ut/transport_adapter_base_test.cpp @@ -268,8 +268,11 @@ namespace Azure { namespace Core { namespace Test { auto response = m_pipeline->Send(request, Azure::Core::Context::ApplicationContext); checkResponseCode(response->GetStatusCode()); - auto expectedResponseBodySize = std::stoull(response->GetHeaders().at("content-length")); - CheckBodyFromStream(*response, expectedResponseBodySize); + if (response->GetStatusCode() == Http::HttpStatusCode::Ok) + { + auto expectedResponseBodySize = std::stoull(response->GetHeaders().at("content-length")); + CheckBodyFromStream(*response, expectedResponseBodySize); + } } TEST_P(TransportAdapter, getChunkWithStream)