Clean geoip.paths before using the path #4306
Merged
Conversation
This file contains 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
Use filepath.Clean on the configured paths to fix any invalid OS path separators. Skip the geoip test with symlinks on Windows (`os.symlink` isn’t supported on Windows).
andrewkroh
force-pushed
the
bugfix/geoip-path-clean
branch
from
5aaa2c4 to
63fa071
Compare
ruflin
approved these changes
May 13, 2017
andrewkroh
added a commit
that referenced
this pull request
May 13, 2017
Use filepath.Clean on the configured paths to fix any invalid OS path separators. Skip the geoip test with symlinks on Windows (`os.symlink` isn’t supported on Windows).
andrewkroh
added a commit
to andrewkroh/beats
that referenced
this pull request
May 26, 2017
Use filepath.Clean on the configured paths to fix any invalid OS path separators. Skip the geoip test with symlinks on Windows (`os.symlink` isn’t supported on Windows).
tsg
pushed a commit
that referenced
this pull request
Jun 2, 2017
* Ignore permission errors in Metricbeat’s TestFileSystemList (#3562) The test can fail if some calls to statfs fail due to permission errors. For example: `stat("/var/lib/docker/aufs/mnt/50d0d5f599f0f19450e7649f73a0e23da1f172048e555df2b1cb78b3fefa355b", 0x7ffd2e5b8ed0) = -1 EACCES (Permission denied)` * Less strict error matching in Winlogbeat config_test Error string testing is brittle. The PR makes the test less stringent by not checking the full error message that includes the Golang stdlib error. * Miscellaneous test fixes - Fix and enable the python smoke test for heartbeat - Remove fmt.Printf from metricbeat ceph module - Fix Windows path issues in libbeat/paths tests - Fix ioutil.TempDir usage in Packetbeat tests (it broke windows) * Using single quotes around Windows paths The thrift test config used double quotes around Windows path separators and this was interpreted incorrectly in YAML parsing. * Rename TestBadCondition to TestConditions This test doesn’t actually test any bad conditions. Plus there is another test in the same directory with the name TestBadCondition. * Use logp.Beta or logp.Experimental in metricsets And in system tests, centralize the logic for asserting that there are no ERR or WARN in logs. Filter out errors about “The service process could not connect to the service controller” that occur when testing on Jenkins where Jenkins itself is running as a service. This confuses the Beat because it thinks that it is running as service, but it’s not. * Remove OS specific error message check from mockbeat The error message “no such file or directory” is an OS specific error message. There is a different error message on Windows. Simply checking for “error loading config file” should be sufficient. * Use shorter filename in Filebeat test for Windows The test was failing on Windows when `os.rename` failed with `[Error 3] The system cannot find the path specified`. The root cause of the failure was that the path was ~260 characters on Jenkins which is greater than the `MAX_PATH` value in Windows. This PR shortens the test log’s name to resolve the issue. The other changes to normalize the filepath are nice to have for Windows, but not strictly required. * Add filesystem name to test error message Errors that are logged by the system/filesystem test case don’t have enough context to debug them. This adds the filesystem that caused the error to the message. * Clean geoip.paths before using the path (#4306) Use filepath.Clean on the configured paths to fix any invalid OS path separators. Skip the geoip test with symlinks on Windows (`os.symlink` isn’t supported on Windows). * Improve winlogbeat checkpoint test (#4371) Check for errors and exit to stop panics from occurring when the test fails. Increase the sleep to 750ms to give the checkpoint more time to flush states to disk. * Fix Winlogbeat test by checking full hostname (#3942) The `computer_name` field in events is the full hostname, but the `win32api.GetComputerName` was returning the shortened netbios name. So the test fail on machines with longer hostnames. * Shorten test name to shorten path for windows (#4360) On our CI system we get the following error: ``` WindowsError: [Error 206] The filename or extension is too long: 'C:\\Users\\jenkins\\workspace\\elastic+beats+pull-request+multijob-windows\\beat\\filebeat\\label\\windows\\src\\github.com\\elastic\\beats\\filebeat\\build\\system-tests\\run\\test_prospector.Test.test_close_inactive_file_rotation_and_removal_while_new_file_created' ``` The problem is that this path is 267 characters long. According to https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx the MAX_PATH length is 260. In general it seems we could hit this limitation also in lots of other ways where we cannot just reduce the length of the test name. There seems to be some possibility to increase this limit: To specify an extended-length path, use the "\\?\" prefix. For example, "\\?\D:\very long path". We should test if this could also solve the problem as it raises the limit to 32767. * Filter relative mounts in system filesystem metricset (#4370) Add filtering to system filesystem metricset to remove relative mountpoints like those from Linux network namespaces.
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.
Use
filepath.Cleanon the configured paths to fix any invalid OS path separators.Skip the geoip test with symlinks on Windows (
os.symlinkisn’t supported on Windows).This should fix the failures seen here: https://beats-ci.elastic.co/job/elastic+beats+5.x+tests-windows/4/testReport/