From bc3d48ef30477229ec6c3ae25a0543420584878c Mon Sep 17 00:00:00 2001 From: meejah Date: Wed, 8 May 2019 14:52:19 -0600 Subject: [PATCH] get rid of skipIf usage --- src/allmydata/test/cli/test_backup.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/allmydata/test/cli/test_backup.py b/src/allmydata/test/cli/test_backup.py index 65ad89891..e05e4600e 100644 --- a/src/allmydata/test/cli/test_backup.py +++ b/src/allmydata/test/cli/test_backup.py @@ -18,9 +18,6 @@ from .common import ( CLITestMixin, parse_options, ) -from ..common import ( - skipIf, -) timeout = 480 # deep_check takes 360s on Zandr's linksys box, others take > 240s @@ -447,11 +444,13 @@ class Backup(GridTestMixin, CLITestMixin, StallMixin, unittest.TestCase): return self._ignore_something_test(u"Symlink", make_symlink) - @skipIf(getattr(os, "mkfifo", None) is None, _unsupported("FIFOs")) def test_ignore_fifo(self): """ A FIFO encountered in the backed-up directory is skipped with a warning. """ + if getattr(os, "mkfifo", None) is None: + raise unittest.SkipTest(_unsupported("FIFOs")) + def make_fifo(path): # Create the thing to ignore os.makedirs(os.path.dirname(path))