Skip to content
This repository has been archived by the owner on Mar 15, 2021. It is now read-only.

Commit

Permalink
renaming of the test that spins up a workbench server
Browse files Browse the repository at this point in the history
  • Loading branch information
brifordwylie committed Jul 2, 2014
1 parent f6f8484 commit 4442ef6
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions test/conftest.py
Expand Up @@ -4,7 +4,7 @@

import zerorpc
import pytest
import workbench_single # This spins up the server
import workbench_singleton # This spins up the server

@pytest.fixture(scope='session')
def workbench_conn(request):
Expand All @@ -15,7 +15,7 @@ def workbench_conn(request):
conn.connect('tcp://localhost:4242')

# Add a finalize method
request.addfinalizer(workbench_single.shutdown)
request.addfinalizer(workbench_singleton.shutdown)

# Return the connection
return conn
12 changes: 12 additions & 0 deletions test/test_server_spinup.py
@@ -0,0 +1,12 @@
''' This spins up a workbench server for the tests to hit '''

class TestServerSpinup(object):
''' Spin up a Worbench test server '''

def test_server_spinup(self, workbench_conn):
''' Start the workbench Server: although it looks like this
test doesn't do anything, because it hits the 'workbench_conn'
fixture a workbench server will spin up '''

print '\nStarting up the Workbench server...'
return True
12 changes: 0 additions & 12 deletions test/test_workbench.py

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion tox.ini
Expand Up @@ -12,7 +12,7 @@ deps =
pytest-cov
pyjack
commands =
py.test -v test/test_workbench.py workbench/workers workbench/clients --doctest-module --cov=workbench --cov-report term-missing
py.test -v test/test_server_spinup.py workbench/workers workbench/clients --doctest-module --cov=workbench --cov-report term-missing

[pytest]
adopts=--doctest-modules
Expand Down

0 comments on commit 4442ef6

Please sign in to comment.