Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
use interpreter shortcut in pytest invocation
· 3012757c
Michael R. Crusoe
authored
Aug 24, 2019
3012757c
improvement from Steve Langasek <steve.langasek@canonical.com>, thanks!
· 4b3ed6d9
Michael R. Crusoe
authored
Aug 26, 2019
4b3ed6d9
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
4b3ed6d9
python-schema-salad (4.5.20190815125611-3) unstable; urgency=medium
* debian/patches/lower-case.patch: improvement from Steve Langasek
<steve.langasek@canonical.com>, thanks! (Closes: #935680)
* debian/rules: use interpreter shortcut in pytest invocation
-- Michael R. Crusoe <michael.crusoe@gmail.com> Mon, 26 Aug 2019 07:07:03 +0200
python-schema-salad (4.5.20190815125611-2) unstable; urgency=medium
* debian/patches/lower-case.patch: better fix
...
...
debian/patches/lower-case.patch
View file @
4b3ed6d9
commit b88e74f8c4c041f1d4d15c56193b07dcddb95400
Author: Michael R. Crusoe <michael.crusoe@gmail.com>
Author: Steve Langasek <steve.langasek@canonical.com>
Date: Fri Aug 16 12:25:07 2019 +0200
only be case insensitive when needed
diff --git a/
schema
_
salad
/tests/test_ref_resolver.py b
/schema_salad/tests/test_ref_resolver.py
index 04f6605..26f2f8a 100644
---
a
/schema_salad/tests/test_ref_resolver.py
+++
b
/schema_salad/tests/test_ref_resolver.py
@@ -13,6 +13,
9
@@
from requests import Session
Index: python-
schema
-
salad
-4.5.20190815125611
/schema_salad/tests/test_ref_resolver.py
===================================================================
---
python-schema-salad-4.5.20190815125611.orig
/schema_salad/tests/test_ref_resolver.py
+++
python-schema-salad-4.5.20190815125611
/schema_salad/tests/test_ref_resolver.py
@@ -13,6 +13,
12
@@
from schema_salad.ref_resolver import DefaultFetcher, Loader, file_uri
from schema_salad.tests.util import get_data
+def is_fs_case_sensitive(path): # https://stackoverflow.com/a/36612604/1585509
+ try:
+ with tempfile.NamedTemporaryFile(prefix='TmP',dir=path) as tmp_file:
+ return(not os.path.exists(tmp_file.name.lower()))
+ except PermissionError:
+ return True
@pytest.fixture
def tmp_dir_fixture(request):
@@ -170,24 +17
3
,27 @@
def test_import_list():
@@ -170,24 +17
6
,27 @@
def test_fetch_inject_id():
...
...
debian/rules
View file @
4b3ed6d9
...
...
@@ -37,7 +37,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
dh_auto_install
PYBUILD_SYSTEM=custom \
PYBUILD_TEST_ARGS="cd {dir}; export PATH={destdir}/usr/bin:$$PATH ; \
cd {build_dir}; export PYTHONPATH=$$(pwd);
python3
-m pytest \
cd {build_dir}; export PYTHONPATH=$$(pwd);
{interpreter}
-m pytest \
-n auto --dist=loadfile --pyarg schema_salad" dh_auto_test
endif
...
...