saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Resolve paths when checking from filenames functionality.

Browse source 
This change fixes the following error seen on windows:
```
Traceback (most recent call last):
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\.nox\pytest-parametrized-3-coverage-true-crypto-none-transport-zeromq\lib\site-packages\_pytest\main.py", line 206, in wrap_session
    session.exitstatus = doit(config, session) or 0
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\.nox\pytest-parametrized-3-coverage-true-crypto-none-transport-zeromq\lib\site-packages\_pytest\main.py", line 249, in _main
    config.hook.pytest_collection(session=session)
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\.nox\pytest-parametrized-3-coverage-true-crypto-none-transport-zeromq\lib\site-packages\pluggy\hooks.py", line 286, in __call__
    return self._hookexec(self, self.get_hookimpls(), kwargs)
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\.nox\pytest-parametrized-3-coverage-true-crypto-none-transport-zeromq\lib\site-packages\pluggy\manager.py", line 92, in _hookexec
    return self._inner_hookexec(hook, methods, kwargs)
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\.nox\pytest-parametrized-3-coverage-true-crypto-none-transport-zeromq\lib\site-packages\pluggy\manager.py", line 86, in <lambda>
    firstresult=hook.spec.opts.get("firstresult") if hook.spec else False,
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\.nox\pytest-parametrized-3-coverage-true-crypto-none-transport-zeromq\lib\site-packages\pluggy\callers.py", line 208, in _multicall
    return outcome.get_result()
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\.nox\pytest-parametrized-3-coverage-true-crypto-none-transport-zeromq\lib\site-packages\pluggy\callers.py", line 80, in get_result
    raise ex[1].with_traceback(ex[2])
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\.nox\pytest-parametrized-3-coverage-true-crypto-none-transport-zeromq\lib\site-packages\pluggy\callers.py", line 187, in _multicall
    res = hook_impl.function(*args)
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\.nox\pytest-parametrized-3-coverage-true-crypto-none-transport-zeromq\lib\site-packages\_pytest\main.py", line 259, in pytest_collection
    return session.perform_collect()
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\.nox\pytest-parametrized-3-coverage-true-crypto-none-transport-zeromq\lib\site-packages\_pytest\main.py", line 498, in perform_collect
    session=self, config=self.config, items=items
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\.nox\pytest-parametrized-3-coverage-true-crypto-none-transport-zeromq\lib\site-packages\pluggy\hooks.py", line 286, in __call__
    return self._hookexec(self, self.get_hookimpls(), kwargs)
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\.nox\pytest-parametrized-3-coverage-true-crypto-none-transport-zeromq\lib\site-packages\pluggy\manager.py", line 92, in _hookexec
    return self._inner_hookexec(hook, methods, kwargs)
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\.nox\pytest-parametrized-3-coverage-true-crypto-none-transport-zeromq\lib\site-packages\pluggy\manager.py", line 86, in <lambda>
    firstresult=hook.spec.opts.get("firstresult") if hook.spec else False,
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\.nox\pytest-parametrized-3-coverage-true-crypto-none-transport-zeromq\lib\site-packages\pluggy\callers.py", line 203, in _multicall
    gen.send(outcome)
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\tests\conftest.py", line 317, in pytest_collection_modifyitems
    from_filenames_collection_modifyitems(config, items)
  File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\tests\conftest.py", line 685, in from_filenames_collection_modifyitems
    itempath = pathlib.Path(str(item.fspath)).relative_to(CODE_DIR)
  File "c:\python37\lib\pathlib.py", line 883, in relative_to
    .format(str(self), str(formatted)))
ValueError: 'C:\\Users\\ADMINI~1\\AppData\\Local\\Temp\\kitchen\\testing\\tests\\integration\\cli\\test_batch.py' does not start with 'C:\\Users\\Administrator\\AppData\\Local\\Temp\\kitchen\\testing'
```
This commit is contained in:
Pedro Algarvio 2020-06-09 17:26:44 +01:00 • committed by Daniel Wozniak
parent 4148d557dd
commit de2fde5d3b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/conftest.py
View file

@ -682,7 +682,7 @@ def from_filenames_collection_modifyitems(config, items):
selected = []
deselected = []
for item in items:
itempath = pathlib.Path(str(item.fspath)).relative_to(CODE_DIR)
itempath = pathlib.Path(str(item.fspath)).resolve().relative_to(CODE_DIR)
if itempath in test_module_paths:
selected.append(item)
else: