From 39469cc41c286944064edb7cfd5333e5c74a3ef8 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Mon, 9 Mar 2020 15:52:50 -0400 Subject: [PATCH] Try harder to skip some things on Windows --- src/_zkapauthorizer/tests/test_storage_protocol.py | 7 +++++++ src/_zkapauthorizer/tests/test_storage_server.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/_zkapauthorizer/tests/test_storage_protocol.py b/src/_zkapauthorizer/tests/test_storage_protocol.py index 7d9de02..ee0dc5b 100644 --- a/src/_zkapauthorizer/tests/test_storage_protocol.py +++ b/src/_zkapauthorizer/tests/test_storage_protocol.py @@ -23,6 +23,9 @@ from __future__ import ( from fixtures import ( MonkeyPatch, ) +from unittest import ( + skipIf, +) from testtools import ( TestCase, ) @@ -54,6 +57,9 @@ from hypothesis.strategies import ( integers, ) +from twisted.python.runtime import ( + platform, +) from twisted.python.filepath import ( FilePath, ) @@ -395,6 +401,7 @@ class ShareTests(TestCase): ) + @skipIf(platform.isWindows(), "Storage server miscomputes slot size on Windows") @given( storage_index=storage_indexes(), secrets=tuples( diff --git a/src/_zkapauthorizer/tests/test_storage_server.py b/src/_zkapauthorizer/tests/test_storage_server.py index 482b2e9..40500cb 100644 --- a/src/_zkapauthorizer/tests/test_storage_server.py +++ b/src/_zkapauthorizer/tests/test_storage_server.py @@ -104,11 +104,11 @@ from ..storage_common import ( summarize, ) -@skipIf(platform.isWindows(), "Storage server is not supported on Windows") class PassValidationTests(TestCase): """ Tests for pass validation performed by ``ZKAPAuthorizerStorageServer``. """ + @skipIf(platform.isWindows(), "Storage server is not supported on Windows") def setUp(self): super(PassValidationTests, self).setUp() self.clock = Clock() -- GitLab