From 4442ef674f505fad33c8e1d556d42e9692a21195 Mon Sep 17 00:00:00 2001
From: Brian Wylie <briford.wylie@gmail.com>
Date: Wed, 2 Jul 2014 14:38:43 -0600
Subject: [PATCH] renaming of the test that spins up a workbench server

---
 test/conftest.py                                     |  4 ++--
 test/test_server_spinup.py                           | 12 ++++++++++++
 test/test_workbench.py                               | 12 ------------
 test/{workbench_single.py => workbench_singleton.py} |  0
 tox.ini                                              |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 test/test_server_spinup.py
 delete mode 100644 test/test_workbench.py
 rename test/{workbench_single.py => workbench_singleton.py} (100%)

diff --git a/test/conftest.py b/test/conftest.py
index 6b04fc8..84b9ac4 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -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):
@@ -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
diff --git a/test/test_server_spinup.py b/test/test_server_spinup.py
new file mode 100644
index 0000000..3f29a81
--- /dev/null
+++ b/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
diff --git a/test/test_workbench.py b/test/test_workbench.py
deleted file mode 100644
index 5bacf1a..0000000
--- a/test/test_workbench.py
+++ /dev/null
@@ -1,12 +0,0 @@
-"""
-Tests for `workbench` module.
-"""
-
-class TestWorkbench(object):
-    ''' Test Workbench Server '''
-
-    def test_server(self, workbench_conn):
-
-        ''' Test the workbench Server '''
-        print '\nStarting up the Workbench server...'
-        return True
diff --git a/test/workbench_single.py b/test/workbench_singleton.py
similarity index 100%
rename from test/workbench_single.py
rename to test/workbench_singleton.py
diff --git a/tox.ini b/tox.ini
index 1a9079c..9ad289b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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