Skip to content

Commit 3598c94

Browse files
committed
Branch skip due to pytest misbehavior.
1 parent eb090ac commit 3598c94

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

notebook/tests/test_notebookapp.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from mock import patch # py2
1616

1717
import nose.tools as nt
18-
import pytest
1918

2019
from traitlets.tests.utils import check_help_all_output
2120

@@ -195,14 +194,13 @@ def test_list_running_servers(self):
195194
assert self.port in {info['port'] for info in servers}
196195

197196

198-
@pytest.mark.skipif(sys.platform.startswith('win'), reason="No UNIX sockets on Windows.")
199-
class NotebookUnixSocketTests(UNIXSocketNotebookTestBase):
200-
@pytest.mark.skipif(sys.platform.startswith('win'), reason="No UNIX sockets on Windows.")
201-
def test_run(self):
202-
self.fetch_url(self.base_url() + 'api/contents')
197+
# UNIX sockets aren't available on Windows.
198+
if not sys.platform.startswith('win'):
199+
class NotebookUnixSocketTests(UNIXSocketNotebookTestBase):
200+
def test_run(self):
201+
self.fetch_url(self.base_url() + 'api/contents')
203202

204-
@pytest.mark.skipif(sys.platform.startswith('win'), reason="No UNIX sockets on Windows.")
205-
def test_list_running_sock_servers(self):
206-
servers = list(notebookapp.list_running_servers())
207-
assert len(servers) >= 1
208-
assert self.sock in {info['sock'] for info in servers}
203+
def test_list_running_sock_servers(self):
204+
servers = list(notebookapp.list_running_servers())
205+
assert len(servers) >= 1
206+
assert self.sock in {info['sock'] for info in servers}

0 commit comments

Comments
 (0)