Skip to content

DO SDK: Fix pipeline VM image and tests #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shishirb-MSFT merged 2 commits into from
May 11, 2022
Merged

DO SDK: Fix pipeline VM image and tests #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
873244b
DO SDK: Specify windows-2019 build VM image
shishirb-MSFT May 11, 2022
176a0bd
DO SDK test: Updates for the set_property workaround
shishirb-MSFT May 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-pipelines/build/windows/dosdkcpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pr:
- sdk-cpp/build/cleanup-install.sh

pool:
vmImage: "windows-latest"
vmImage: "windows-2019"

jobs:
- job: Debug
Expand Down
7 changes: 4 additions & 3 deletions sdk-cpp/tests/com/download_properties_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,19 @@ TEST_F(DownloadPropertyTestsDOSVC, InvalidPhfDigestTest)
{
auto simpleDownload = msdo::download::make(g_smallFileUrl, g_tmpFileName);

msdo::download_property_value integrityCheckInfo = msdo::download_property_value::make("blah");
try
{
msdo::download_property_value integrityCheckInfo = msdo::download_property_value::make("blah");
// Call fails only on 19041+ builds of Windows. Earlier versions did not support setting
// PHF info through IDODownload and the SDK has a workaround to ignore that error.
simpleDownload->set_property(msdo::download_property::integrity_check_info, integrityCheckInfo);
}
catch (const msdo::exception& e)
{
std::vector<int32_t> expectedErrors = { static_cast<int32_t>(msdo::errc::invalid_arg), static_cast<int32_t>(msdo::errc::do_e_unknown_property_id) };
std::vector<int32_t> expectedErrors = { static_cast<int32_t>(msdo::errc::invalid_arg) };
VerifyError(e.error_code().value(), expectedErrors);
return;
}
ASSERT_TRUE(false);
}

// For some reason, custom headers are getting rejected and returning E_INVALIDARG now, disabling test for now
Expand Down
5 changes: 2 additions & 3 deletions sdk-cpp/tests_nothrow/download_properties_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,11 @@ TEST_F(DownloadPropertyTestsDOSVC_NoThrow, InvalidPhfDigestTest)
auto simpleDownload = g_MakeDownload(g_smallFileUrl, g_tmpFileName);

msdo::download_property_value integrityCheckInfo = g_MakePropertyValue("blah");
std::vector<int32_t> expectedErrors = { static_cast<int32_t>(msdo::errc::invalid_arg),
static_cast<int32_t>(msdo::errc::do_e_unknown_property_id) };
std::vector<int32_t> expectedErrors = { 0, static_cast<int32_t>(msdo::errc::invalid_arg) };
VerifyCallWithExpectedErrors([&]()
{
return simpleDownload->set_property_nothrow(msdo::download_property::integrity_check_info, integrityCheckInfo);
}, { static_cast<int32_t>(msdo::errc::invalid_arg), static_cast<int32_t>(msdo::errc::do_e_unknown_property_id) });
}, expectedErrors);
}

// For some reason, custom headers are getting rejected and returning E_INVALIDARG now, disabling test for now
Expand Down