mirror of
https://github.com/samsonjs/vdirsyncer.git
synced 2026-04-27 14:57:41 +00:00
Fix test failures that ONLY happen on master
This commit is contained in:
parent
b5dd0929d0
commit
1031b07349
3 changed files with 3 additions and 3 deletions
|
|
@ -63,7 +63,6 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"env": "BUILD=test-storage DAV_SERVER=fastmail REQUIREMENTS=release ",
|
"env": "BUILD=test-storage DAV_SERVER=fastmail REQUIREMENTS=release ",
|
||||||
"if": "NOT (type IN (pull_request))",
|
|
||||||
"python": "3.6"
|
"python": "3.6"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -64,8 +64,7 @@ for python, requirements in itertools.product(
|
||||||
if python == '3.5':
|
if python == '3.5':
|
||||||
job['dist'] = 'trusty'
|
job['dist'] = 'trusty'
|
||||||
|
|
||||||
build_prs = dav_server not in ("fastmail", "davical", "icloud")
|
if dav_server in ("davical", "icloud"):
|
||||||
if not build_prs:
|
|
||||||
job['if'] = 'NOT (type IN (pull_request))'
|
job['if'] = 'NOT (type IN (pull_request))'
|
||||||
|
|
||||||
matrix.append(job)
|
matrix.append(job)
|
||||||
|
|
|
||||||
|
|
@ -133,6 +133,8 @@ class TestCalDAVStorage(DAVStorageTests):
|
||||||
|
|
||||||
@pytest.mark.skipif(dav_server == 'icloud',
|
@pytest.mark.skipif(dav_server == 'icloud',
|
||||||
reason='iCloud only accepts VEVENT')
|
reason='iCloud only accepts VEVENT')
|
||||||
|
@pytest.mark.skipif(dav_server == 'fastmail',
|
||||||
|
reason='Fastmail has non-standard hadling of VTODOs.')
|
||||||
def test_item_types_general(self, s):
|
def test_item_types_general(self, s):
|
||||||
event = s.upload(format_item(EVENT_TEMPLATE))[0]
|
event = s.upload(format_item(EVENT_TEMPLATE))[0]
|
||||||
task = s.upload(format_item(TASK_TEMPLATE))[0]
|
task = s.upload(format_item(TASK_TEMPLATE))[0]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue