> On Jan. 8, 2018, 11:46 p.m., Gaston Kleiman wrote: > > src/tests/health_check_tests.cpp > > Lines 103 (patched) > > <https://reviews.apache.org/r/64387/diff/4/?file=1931080#file1931080line103> > > > > Can we use `#ifdef __WINDOWS__` here and in the other files below? > > > > Also we seem to close the blocks with `!__WINDOWS__` instead of with > > `__WINDOWS__` only in: `3rdparty/stout/include/stout/abort.hpp`, > > `src/tests/health_check_tests.cpp`, and in `src/tests/check_tests.cpp` - > > should we start doing this everywhere?
It seems that the `__WINDOWS__` closure for `#ifndef __WINDOWS__` blocks is generally used throughout mesos and those files are the exceptions. So, I think it makes sense to change those files to be consistent with the rest of the mesos codebase. > On Jan. 8, 2018, 11:46 p.m., Gaston Kleiman wrote: > > src/tests/health_check_tests.cpp > > Line 916 (original), 959 (patched) > > <https://reviews.apache.org/r/64387/diff/4/?file=1931080#file1931080line960> > > > > Why can't we create the temporary file inside the tests' sandbox > > (`os::getcwd()`)? > > > > This sandbox is a temporary directory created by > > `TemporaryDirectoryTest::SetUp`. Oh i see. I though `os::getcwd` was getting `mesos-tests.exe`'s current directory, which might have caused problems if the executable wasn't on the C drive. For example, if the `mesos-tests` directory was D:\mesos, then you wouldn't be able to create D:\mesos inside the container without more setup, because the only the C drive exists by default. Temp directories are always in the C drive, so that should be okay. > On Jan. 8, 2018, 11:46 p.m., Gaston Kleiman wrote: > > src/tests/health_check_tests.cpp > > Line 934 (original), 990 (patched) > > <https://reviews.apache.org/r/64387/diff/4/?file=1931080#file1931080line991> > > > > Just curious, are 60 not enough on Windows? Just a mistake. I'll revert back to 60 seconds. All the other sleep commands are 120 seconds, but this one is 60. - Akash ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/64387/#review194994 ----------------------------------------------------------- On Jan. 10, 2018, 1:41 a.m., Akash Gupta wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/64387/ > ----------------------------------------------------------- > > (Updated Jan. 10, 2018, 1:41 a.m.) > > > Review request for mesos, Alexander Rukletsov, Andrew Schwartzmeyer, Gaston > Kleiman, Jie Yu, Joseph Wu, and Michael Park. > > > Repository: mesos > > > Description > ------- > > The `HealthCheckTest.ROOT_DOCKER_*` and > `DockerContainerizerHealthCheckTest.*` tests now work on Windows. > > > Diffs > ----- > > src/tests/environment.cpp 72bd621f02f97ea5fd553f3dc0bd52adb8ddee8f > src/tests/health_check_tests.cpp 1893c85169f5e94e164434b93e6a24268224225d > src/tests/mesos.hpp 93913f2e01898c73e09de58a975aa467e714d882 > > > Diff: https://reviews.apache.org/r/64387/diff/5/ > > > Testing > ------- > > Windows Server: > [==========] Running 5 tests from 2 test cases. > [----------] Global test environment set-up. > [----------] 2 tests from HealthCheckTest > [ RUN ] HealthCheckTest.ROOT_DOCKER_DockerHealthyTask > [ OK ] HealthCheckTest.ROOT_DOCKER_DockerHealthyTask (21263 ms) > [ RUN ] HealthCheckTest.ROOT_DOCKER_DockerHealthStatusChange > [ OK ] HealthCheckTest.ROOT_DOCKER_DockerHealthStatusChange (23512 ms) > [----------] 2 tests from HealthCheckTest (44835 ms total) > > [----------] 3 tests from NetworkProtocol/DockerContainerizerHealthCheckTest > [ RUN ] > NetworkProtocol/DockerContainerizerHealthCheckTest.ROOT_DOCKER_USERNETWORK_NETNAMESPACE_HealthyTaskViaHTTP/0 > [ OK ] > NetworkProtocol/DockerContainerizerHealthCheckTest.ROOT_DOCKER_USERNETWORK_NETNAMESPACE_HealthyTaskViaHTTP/0 > (28487 ms) > [ RUN ] > NetworkProtocol/DockerContainerizerHealthCheckTest.ROOT_DOCKER_USERNETWORK_NETNAMESPACE_HealthyTaskViaHTTPS/0 > [ OK ] > NetworkProtocol/DockerContainerizerHealthCheckTest.ROOT_DOCKER_USERNETWORK_NETNAMESPACE_HealthyTaskViaHTTPS/0 > (26447 ms) > [ RUN ] > NetworkProtocol/DockerContainerizerHealthCheckTest.ROOT_DOCKER_USERNETWORK_NETNAMESPACE_HealthyTaskViaTCP/0 > [ OK ] > NetworkProtocol/DockerContainerizerHealthCheckTest.ROOT_DOCKER_USERNETWORK_NETNAMESPACE_HealthyTaskViaTCP/0 > (26264 ms) > [----------] 3 tests from NetworkProtocol/DockerContainerizerHealthCheckTest > (81268 ms total) > > [----------] Global test environment tear-down > [==========] 5 tests from 2 test cases ran. (126559 ms total) > [ PASSED ] 5 tests > > Rest of tests pass. > > Windows Client (Disabled network health checks): > Proof that network health checks are skipped on Windows Client. > C:\Program Files\Docker\Docker\Resources\bin\docker.exe: Error response from > daemon: sharing of hyperv containers network is not supported. > 356b087e7fa640f83fe27ebeb3396bfc7b2bbebd917aeaec0508b887b41d31f4 > ------------------------------------------------------------- > We cannot run any Docker health checks tests because: > Running in another container's namespace is not supported on this version of > Windows. > > Rest rests pass. > > Linux: > make check passes > > > Thanks, > > Akash Gupta > >
