diff options
author | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2022-06-28 10:49:41 +0000 |
---|---|---|
committer | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2022-06-28 12:20:16 +0000 |
commit | 513ce835b55831d343185e03a51efa2901405ac8 (patch) | |
tree | 602f02bacfcb413ce351943ebf4e845281e3b008 /libexec | |
parent | 8e1c23341c0c1b161f7fe9aa76ca2e399ada9f45 (diff) | |
download | src-513ce835b55831d343185e03a51efa2901405ac8.tar.gz src-513ce835b55831d343185e03a51efa2901405ac8.zip |
testing: pass ATF vars to pytest via env instead of arguments.
This change is a continuation of 9c42645a1e4d workaround.
Apparently pytest argument parser is not happy when parsing values
with spaces or just more than one --atf-var argument.
Switch wrapper to send these kv pairs as env variables. Specifically,
use _ATF_VAR_key=value format to distinguish from the other vars.
Add the `atf_vars` fixture returning all passed kv pairs as a dict.
Reviewed by: lwhsu
Differential Revision: https://reviews.freebsd.org/D35625
MFC after: 2 weeks
Diffstat (limited to 'libexec')
-rw-r--r-- | libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp b/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp index bc7eec3b851d..6baa85999070 100644 --- a/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp +++ b/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp @@ -1,5 +1,6 @@ #include <format> #include <iostream> +#include <map> #include <string> #include <vector> #include <stdlib.h> @@ -10,6 +11,7 @@ class Handler { const std::string kPytestName = "pytest"; const std::string kCleanupSuffix = ":cleanup"; const std::string kPythonPathEnv = "PYTHONPATH"; + const std::string kAtfVar = "_ATF_VAR_"; public: // Test listing requested bool flag_list = false; @@ -28,7 +30,7 @@ class Handler { // Name of the test to run (provided by ATF) std::string test_name; // kv pairs (provided by ATF) - std::vector<std::string> kv_list; + std::map<std::string,std::string> kv_map; // our binary name std::string binary_name; @@ -102,7 +104,14 @@ class Handler { dst_file = std::string(optarg); break; case 'v': - kv_list.emplace_back(std::string(optarg)); + { + std::string kv = std::string(optarg); + size_t splitter = kv.find("="); + if (splitter == std::string::npos) { + Usage("Unknown variable: " + kv, true); + } + kv_map[kv.substr(0, splitter)] = kv.substr(splitter + 1); + } break; default: Usage("Unknown option -" + std::string(1, static_cast<char>(c)), true); @@ -147,16 +156,12 @@ class Handler { if (!dst_file.empty()) { args.push_back("--atf-file=" + dst_file); } - for (auto &pair: kv_list) { - args.push_back("--atf-var"); - args.push_back(pair); - } // Create nodeid from the test path &name args.push_back(script_path + "::" + test_name); return args; } - void SetEnv() { + void SetPythonPath() { if (!python_path.empty()) { char *env_path = getenv(kPythonPathEnv.c_str()); if (env_path != nullptr) { @@ -166,6 +171,16 @@ class Handler { } } + void SetEnv() { + SetPythonPath(); + + // Pass ATF kv pairs as env variables to avoid dealing with + // pytest parser + for (auto [k, v]: kv_map) { + setenv((kAtfVar + k).c_str(), v.c_str(), 1); + } + } + int Run(std::string binary, std::vector<std::string> args) { if (flag_debug) { PrintVector("OUT", args); |