- Fix wart in PR #49087 file://c:\foo\bar vs c:\foo\bar local paths
- Finalize fix for test_issue_8343_accumulated_require_in
- Fix wart in PR #49088 Ignore proper directory test
When searching for a line in a file that has CRLF line endings, the
normal $ regex will not match a line. With this change, we will match on
but not include LF, CRLF, and the end of a file.
This change does 2 things:
- Skip 2 tests: they are not actually _testing_ anything, just running functions
Let's skip these for now until we can dedicate some time to investigate what
should be tested here. This will also help the tests breath a little bit.
- Add a small sleep to the async test. This test needs a little breathing room so
the procs don't get stepped on. I think this is what is causing the master to
shut down sometimes during test runs:
```
08:41:47 test_wheel_async (integration.netapi.test_client.NetapiClientTest)
08:41:47 [CPU:0.0%|MEM:13.2%] ... 12:41:47,280 [salt.utils.process :670 ][ERROR ] An un-handled exception from the multiprocessing process 'SignalHandlingMultiprocessingProcess-24' was caught:
08:41:47 Traceback (most recent call last):
08:41:47 File "/tmp/kitchen/testing/salt/utils/process.py", line 663, in _run
08:41:47 return self._original_run()
08:41:47 File "/usr/lib/python3.5/multiprocessing/process.py", line 93, in run
08:41:47 self._target(*self._args, **self._kwargs)
08:41:47 File "/tmp/kitchen/testing/salt/client/mixins.py", line 457, in _proc_function
08:41:47 salt.utils.daemonize()
08:41:47 File "/tmp/kitchen/testing/salt/utils/__init__.py", line 514, in daemonize
08:41:47 os.dup2(dev_null.fileno(), sys.stdout.fileno())
08:41:47 io.UnsupportedOperation: fileno
08:41:47 Process SignalHandlingMultiprocessingProcess-24:
08:41:47 Traceback (most recent call last):
08:41:47 File "/usr/lib/python3.5/multiprocessing/process.py", line 249, in _bootstrap
08:41:47 self.run()
08:41:47 File "/tmp/kitchen/testing/salt/utils/process.py", line 663, in _run
08:41:47 return self._original_run()
08:41:47 File "/usr/lib/python3.5/multiprocessing/process.py", line 93, in run
08:41:47 self._target(*self._args, **self._kwargs)
08:41:47 File "/tmp/kitchen/testing/salt/client/mixins.py", line 457, in _proc_function
08:41:47 salt.utils.daemonize()
08:41:47 File "/tmp/kitchen/testing/salt/utils/__init__.py", line 514, in daemonize
08:41:47 os.dup2(dev_null.fileno(), sys.stdout.fileno())
08:41:47 io.UnsupportedOperation: fileno
```
The fix in #49002 was incomplete and when run on Debian, it hits a
`ValueError` when the RELEASE variable is a string with a decimal.
This change fixes the error.
