summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Khyn <thomas@ksytek.com>2014-06-22 22:47:09 +1200
committerThomas Khyn <thomas@ksytek.com>2014-06-22 22:47:09 +1200
commit6150388253d82aeb51ef9acb2b7bc018d96be073 (patch)
treeaf044cbd2f9dfff103f16ab81255c4d96dc85088
parent558110896ab254cc80c86a3ab73210b9f09928c9 (diff)
downloadpyscss-6150388253d82aeb51ef9acb2b7bc018d96be073.tar.gz
Updated tests generation to cope with win32's separator
--HG-- branch : compat_win
-rw-r--r--scss/tests/conftest.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scss/tests/conftest.py b/scss/tests/conftest.py
index d607a85..62a7b65 100644
--- a/scss/tests/conftest.py
+++ b/scss/tests/conftest.py
@@ -37,18 +37,18 @@ def pytest_configure(config):
# relative paths to the input file.
test_file_tuples = []
test_file_ids = []
- for fn in glob.glob(os.path.join(FILES_DIR, '*/*.scss')):
+ for fn in glob.glob(os.path.join(FILES_DIR, '*%s*.scss' % os.sep)):
if os.path.basename(fn)[0] == '_':
continue
relfn = os.path.relpath(fn, FILES_DIR)
pytest_trigger = None
- if relfn.startswith(('from-sassc/', 'from-ruby/')):
+ if relfn.startswith(('from-sassc' + os.sep, 'from-ruby' + os.sep)):
pytest_trigger = pytest.mark.skipif(
not include_ruby, reason="skipping ruby tests by default")
- elif relfn.startswith('xfail/'):
+ elif relfn.startswith('xfail' + os.sep):
pytest_trigger = pytest.mark.xfail
if file_filters and not any(rx.search(relfn) for rx in file_filters):