Commit b2fa638d6d added a lot of extra options. One of these lines (hwaddr) was commented out when it was added. It appears that this was a typo because documentation indicates this line /should/ show up in the interfaces file.
Tests were failing because _parse_interfaces is returning the correct data per mocked data. The assertion was expecting the iface line to have been stripped.
Added a check to make sure inet6 iface lines have the variables needed to prevent a render error.
Also added some whitespace and jinja comment blocks to more easily identify what's going on in this file.
Also removed some mocks that were not needed anymore for the
calls to ``file.contains_regex_multiline`` because that function
is no longer called in the state file.
After looking at this a bit more closely, I believe "interface.address" was meant to be "interface.addrfam" which /does/ make sense on this line.
Because of the previous notion that all interfaces will have an address, it seems a second line was created that assumed the only scenario where an iface won't have an address is when dhcp is used. Again, not an accurate assumption. I believe this /should/ handle most expected situations.
This was left in to debug per-saltenv config overlays. I thought I had
removed it weeks ago, but I guess I didn't, and it made it into
2016.11.0. This commit removes the debugging code.
Pull request #37889 introduced several problems:
1. It forces a wipe of the extracted contents if you are setting
``overwrite`` to ``True``. This should be configurable, to allow for
the use case where extraction should be forced but there are contents
added to the extracted content which the user does not want purged
before the archive is re-extracted.
2. It ignores the case where ``enforce_toplevel`` is set to ``False``
and the archive doesn't have all contents in a single top-level
directory, by only deleting the first listed top-level directory (and
ignoring completely any top-level files).
3. It ignores the case where ``archive.list`` was unable to list the
contents of the archive (in which case ``contents`` would be
``None``). This would result in a TypeError when this case was
combined with setting ``overwrite`` to ``True``.
This commit fixes all of the above problems. Additionally, a new
argument called ``clean`` now controls whether destination paths are
wiped before extraction is performed.
Finally, an issue with how I implemented detection (and cleaning) of
paths with incorrect types has been fixed. Specifically, when a path
that should have been a directory is instead a file, the ``os.stat()``
will raise an ENOTDIR when the path passed to it contains a trailing
path separator, because the path exists but is not a directory.
* Modify daemons test to use multiprocessing
Without this approach, instantiating a master/minion from this test
would affect the parser tests down the line.
* Fix typo
* Fix copy/paste error
* Add missing attr
sleep sometimes is found in /bin/sleep, like in ubuntu. We should just
depend on the PATH variable being correct, and finding sleep, instead of
explicitly saying /usr/bin/sleep
