mirror of
https://github.com/microsoft/WSL.git
synced 2025-12-10 00:44:55 -06:00
Test cleanup
This commit is contained in:
parent
9dd34f230d
commit
292707e3ac
@ -120,13 +120,11 @@ std::vector<std::string> WSLAContainer::PrepareNerdctlRunCommand(const WSLA_CONT
|
|||||||
args.push_back("--gpus");
|
args.push_back("--gpus");
|
||||||
// TODO: Parse GPU device list from WSLA_CONTAINER_OPTIONS. For now, just enable all GPUs.
|
// TODO: Parse GPU device list from WSLA_CONTAINER_OPTIONS. For now, just enable all GPUs.
|
||||||
args.push_back("all");
|
args.push_back("all");
|
||||||
// args.push_back(options.GPUOptions.GPUDevices);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
args.insert(args.end(), defaultNerdctlRunArgs.begin(), defaultNerdctlRunArgs.end());
|
args.insert(args.end(), defaultNerdctlRunArgs.begin(), defaultNerdctlRunArgs.end());
|
||||||
args.insert(args.end(), inputOptions.begin(), inputOptions.end());
|
args.insert(args.end(), inputOptions.begin(), inputOptions.end());
|
||||||
|
|
||||||
// TODO: need to worry about env variables with dashes in them?
|
|
||||||
for (ULONG i = 0; i < options.InitProcessOptions.EnvironmentCount; i++)
|
for (ULONG i = 0; i < options.InitProcessOptions.EnvironmentCount; i++)
|
||||||
{
|
{
|
||||||
THROW_HR_IF_MSG(
|
THROW_HR_IF_MSG(
|
||||||
|
|||||||
@ -66,6 +66,7 @@ HRESULT WSLAUserSessionImpl::OpenSessionByName(LPCWSTR DisplayName, IWSLASession
|
|||||||
{
|
{
|
||||||
std::lock_guard lock(m_wslaSessionsLock);
|
std::lock_guard lock(m_wslaSessionsLock);
|
||||||
|
|
||||||
|
// TODO: ACL check
|
||||||
// TODO: Check for duplicate on session creation.
|
// TODO: Check for duplicate on session creation.
|
||||||
for (auto& e : m_sessions)
|
for (auto& e : m_sessions)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1167,7 +1167,7 @@ class WSLATests
|
|||||||
// TODO: Remove once the proper rootfs VHD is available.
|
// TODO: Remove once the proper rootfs VHD is available.
|
||||||
ExpectCommandResult(session.get(), {"/etc/lsw-init.sh"}, 0);
|
ExpectCommandResult(session.get(), {"/etc/lsw-init.sh"}, 0);
|
||||||
|
|
||||||
/*// Test a simple container start.
|
// Test a simple container start.
|
||||||
{
|
{
|
||||||
WSLAContainerLauncher launcher("debian:latest", "test-simple", "echo", {"OK"});
|
WSLAContainerLauncher launcher("debian:latest", "test-simple", "echo", {"OK"});
|
||||||
auto container = launcher.Launch(*session);
|
auto container = launcher.Launch(*session);
|
||||||
@ -1182,7 +1182,7 @@ class WSLATests
|
|||||||
{{"testenv=testvalue"}}); auto container = launcher.Launch(*session); auto process = container.GetInitProcess();
|
{{"testenv=testvalue"}}); auto container = launcher.Launch(*session); auto process = container.GetInitProcess();
|
||||||
|
|
||||||
ValidateProcessOutput(process, {{1, "testvalue\n"}});
|
ValidateProcessOutput(process, {{1, "testvalue\n"}});
|
||||||
}*/
|
}
|
||||||
|
|
||||||
// Validate that starting containers work with the default entrypoint.
|
// Validate that starting containers work with the default entrypoint.
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user