Docker#666 keyscan#731 posixcompatnewunittests #152
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
contrib/win32/win32compat/misc.c
Outdated
| } | ||
|
|
||
| /* if opening null device, point to Windows equivalent */ | ||
| if (0 == strncmp(path, NULL_DEVICE, strlen(NULL_DEVICE))) |
There was a problem hiding this comment.
should it be strlen(NULL_DEVICE)+1 ?
| ASSERT_PTR_NE(handle, INVALID_HANDLE_VALUE); \ | ||
| ASSERT_PTR_NE(handle, 0); \ | ||
| retValue = ((handle != INVALID_HANDLE_VALUE) && (handle != NULL)) ? 0 : -1; \ | ||
| ASSERT_INT_EQ(retValue, 0); \ |
There was a problem hiding this comment.
reverting this.?
If ASSERT_INT_EQ(retValue, 0) fails, you don't know upfront (from test execution output) whether its due to handle is invalid_handle or NULL.
But with 2 explicit asserts, you know if handle was null or invalid_handle.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
docker ssh issue
docker-machine doesn't work with this version of OpenSSH Win32-OpenSSH#666
a) fdopen changes to accept the /dev/null device
b) fix the select (using same fdset as readfdset, exceptfdset) issue with the unix opensssh code.
changed keyscan pester test to refer to localhost (127.0.0.1) instead of GitHub.com
Enable keyutility pester testcases and change ssh-keyscan to use localhost Win32-OpenSSH#731
Fix the ASSERT_HANDLE issue..
ASSERT_HANDLE should fail if handle is either NULL or INVALID_HANDLE.
Added new testcases for the null device.