mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1792 from ThomasWaldmann/cygwin-no-remote-archiver-tests 

skip remote tests on cygwin
This commit is contained in:
TW 2016-11-05 14:24:34 +01:00 committed by GitHub
parent 94ff4959ee df7191e55c
commit 19891d655b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
borg/testsuite/archiver.py
View File

@ -1444,7 +1444,7 @@ class ArchiverCheckTestCase(ArchiverTestCaseBase):
self.cmd('check', self.repository_location, exit_code=0) self.cmd('check', self.repository_location, exit_code=0)
self.cmd('extract', '--dry-run', self.repository_location + '::archive1', exit_code=0) self.cmd('extract', '--dry-run', self.repository_location + '::archive1', exit_code=0)
@pytest.mark.skipif(sys.platform == 'cygwin', reason='remote is broken on cygwin and hangs')
class RemoteArchiverTestCase(ArchiverTestCase): class RemoteArchiverTestCase(ArchiverTestCase):
prefix = '__testsuite__:' prefix = '__testsuite__:'

4
borg/testsuite/repository.py
View File

@ -4,6 +4,8 @@ import sys
import tempfile import tempfile
from unittest.mock import patch from unittest.mock import patch
import pytest
from ..hashindex import NSIndex from ..hashindex import NSIndex
from ..helpers import Location, IntegrityError from ..helpers import Location, IntegrityError
from ..locking import Lock, LockFailed from ..locking import Lock, LockFailed
@ -413,6 +415,7 @@ class RepositoryCheckTestCase(RepositoryTestCaseBase):
self.assert_equal(self.repository.get(H(0)), b'data2') self.assert_equal(self.repository.get(H(0)), b'data2')
@pytest.mark.skipif(sys.platform == 'cygwin', reason='remote is broken on cygwin and hangs')
class RemoteRepositoryTestCase(RepositoryTestCase): class RemoteRepositoryTestCase(RepositoryTestCase):
def open(self, create=False): def open(self, create=False):
@ -443,6 +446,7 @@ class RemoteRepositoryTestCase(RepositoryTestCase):
assert self.repository.borg_cmd(args, testing=False) == ['borg-0.28.2', 'serve', '--umask=077', '--info'] assert self.repository.borg_cmd(args, testing=False) == ['borg-0.28.2', 'serve', '--umask=077', '--info']
@pytest.mark.skipif(sys.platform == 'cygwin', reason='remote is broken on cygwin and hangs')
class RemoteRepositoryCheckTestCase(RepositoryCheckTestCase): class RemoteRepositoryCheckTestCase(RepositoryCheckTestCase):
def open(self, create=False): def open(self, create=False):