d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testing: provide meaningful error when pytest is not available

Browse Source 
atf format does not provide any way of signalling any error message
 back to the atf runner when listing tests. Work this around by
 reporting "__test_cases_list_pytest_binary_not_found__" test instead.

Reviewed By: kp
Differential Revision: https://reviews.freebsd.org/D35721
This commit is contained in:
Alexander V. Chernikov 2022-07-06 19:55:48 +00:00
parent 6f50b73ee5
commit 2bfd8b5b94
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp
View File

@ -1,3 +1,5 @@
// vim: ts=2 sw=2 et
#include <format>
#include <iostream>
#include <map>
@ -181,7 +183,7 @@ class Handler {
}
}
int Run(std::string binary, std::vector<std::string> args) {
bool Run(std::string binary, std::vector<std::string> args) {
if (flag_debug) {
PrintVector("OUT", args);
}
@ -191,12 +193,27 @@ class Handler {
// work around 'char *const *'
arr[i] = strdup(args[i].c_str());
}
return (execvp(binary.c_str(), arr) != 0);
return execvp(binary.c_str(), arr) == 0;
}
void ReportError() {
if (flag_list) {
std::cout << "Content-Type: application/X-atf-tp; version=\"1\"";
std::cout << std::endl << std::endl;
std::cout << "ident: __test_cases_list_"<< kPytestName << "_binary_" <<
"not_found__" << std::endl;
} else {
std::cout << "execvp(" << kPytestName << ") failed: " <<
std::strerror(errno) << std::endl;
}
}
int Process() {
SetEnv();
return Run(kPytestName, BuildArgs());
if (!Run(kPytestName, BuildArgs())) {
ReportError();
}
return 0;
}
};