sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #308 from untitaker/davical-testserver

Browse source 
Add davical tests to Travis
This commit is contained in:
Markus Unterwaditzer 2015-12-18 18:49:08 +01:00
commit b96ace761b
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.travis.yml
View file

@ -32,6 +32,12 @@ matrix:
env: BUILD=test DAV_SERVER=baikal REQUIREMENTS=release env: BUILD=test DAV_SERVER=baikal REQUIREMENTS=release
- python: 2.7 - python: 2.7
env: BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal env: BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal
- python: 2.7
env: BUILD=test DAV_SERVER=davical REQUIREMENTS=devel
- python: 2.7
env: BUILD=test DAV_SERVER=davical REQUIREMENTS=release
- python: 2.7
env: BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal
- python: 3.3 - python: 3.3
env: BUILD=style env: BUILD=style
- python: 3.3 - python: 3.3
@ -62,6 +68,12 @@ matrix:
env: BUILD=test DAV_SERVER=baikal REQUIREMENTS=release env: BUILD=test DAV_SERVER=baikal REQUIREMENTS=release
- python: 3.5 - python: 3.5
env: BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal env: BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal
- python: 3.5
env: BUILD=test DAV_SERVER=davical REQUIREMENTS=devel
- python: 3.5
env: BUILD=test DAV_SERVER=davical REQUIREMENTS=release
- python: 3.5
env: BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal
- python: pypy - python: pypy
env: BUILD=style env: BUILD=style
- python: pypy - python: pypy

2
scripts/make_travisconf.py
View file

@ -40,7 +40,7 @@ with section("matrix"):
p(" env: BUILD=style") p(" env: BUILD=style")
if python in ("2.7", "3.5"): if python in ("2.7", "3.5"):
dav_servers = ("radicale", "owncloud", "baikal") dav_servers = ("radicale", "owncloud", "baikal", "davical")
else: else:
dav_servers = ("radicale",) dav_servers = ("radicale",)

2
vdirsyncer/utils/compat.py
View file

@ -27,7 +27,7 @@ def _wrap_native(f, encoding='utf-8'):
@functools.wraps(f) @functools.wraps(f)
def wrapper(x, *a, **kw): def wrapper(x, *a, **kw):
to_orig = to_unicode if isinstance(x, text_type) else to_bytes to_orig = to_unicode if isinstance(x, text_type) else to_bytes
return to_orig(f(to_native(x, encoding), *a, **kw)) return to_orig(f(to_native(x, encoding), *a, **kw), encoding)
return wrapper return wrapper