ensure config file is updated correctly #542
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
jinhyunr
approved these changes
Jan 11, 2017
| @patch('os.path.isfile') | ||
| def test_update_conf_file(self, _): | ||
| new_file = "\ | ||
| DEVICE=eth0\n\ |
There was a problem hiding this comment.
is this indentation intentional?
There was a problem hiding this comment.
yes.. whitespace is not stripped when provided to the patch.
| @@ -140,9 +140,9 @@ def update_conf_file(path, line_start, val, chk_err=False): | |||
| if not os.path.isfile(path) and chk_err: | |||
| raise IOError("Can't find config file:{0}".format(path)) | |||
| conf = read_file(path).split('\n') | |||
| conf = [x for x in conf if not x.startswith(line_start)] | |||
| conf = [x for x in conf if not x.startswith(line_start) and x is not None and len(x) > 0] | |||
There was a problem hiding this comment.
shouldn't 'x is not None' come before x.startswith() ?
hglkrijger
added a commit
to hglkrijger/WALinuxAgent
that referenced
this pull request
Jan 11, 2017
* ensure config file is updated correctly * unit test fix * correct ordering
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.
In
fileutil.update_conf_filewe do not append a final newline, which can cause values to become unreadable. Also, when updating a value, we can potentially add multiple newline characters. This change addresses both cases./cc @brendandixon @jinhyunr