Merge pull request #15 from BenjamenMeyer/refactor_tests

Refactor tests

.coveragerc

@@ -0,0 +1,10 @@
+[report]
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain if tests don't hit defensive assertion code:
+    raise NotImplementedError
+
+[run]
+omit = *tests*

setup.cfg

@@ -0,0 +1,9 @@
+[nosetests]
+match=^test
+where=stackinabox
+with-coverage=true
+cover-package=stackinabox
+cover-erase=1
+cover-inclusive=true
+cover-branches=true
+cover-min-percentage=70

stackinabox/services/service.py

@@ -5,6 +5,8 @@
 import re
 import uuid
 
+import six
+
 
 logger = logging.getLogger(__name__)
 
@@ -64,7 +66,7 @@ def base_url(self, value):
                              self.__base_url,
                              value))
         self.__base_url = value
-        for k, v in self.routes.items():
+        for k, v in six.iteritems(self.routes):
             v['regex'] = StackInABoxService.__get_service_regex(value,
                                                                 v['uri'])
 
@@ -88,7 +90,7 @@ def request(self, method, request, uri, headers):
                          'query = "{3}"'
                          .format(self.__id, self.name, uri_path, uri_qs))
 
-        for k, v in self.routes.items():
+        for k, v in six.iteritems(self.routes):
             logger.debug('StackInABoxService ({0}:{1}): Checking if '
                          'route {2} handles...'
                          .format(self.__id, self.name, v['uri']))

stackinabox/stack.py

@@ -3,9 +3,10 @@
 """
 import logging
 import re
+import threading
 import uuid
 
-import threading
+import six
 
 
 logger = logging.getLogger(__name__)
@@ -90,7 +91,7 @@ def base_url(self, value):
         logger.debug('StackInABox({0}): Updating URL from {1} to {2}'
                      .format(self.__id, self.__base_url, value))
         self.__base_url = value
-        for k, v in self.services.items():
+        for k, v in six.iteritems(self.services):
             matcher, service = v
             service.base_url = StackInABox.__get_service_url(value,
                                                              service.name)
@@ -100,7 +101,7 @@ def base_url(self, value):
     def reset(self):
         logger.debug('StackInABox({0}): Resetting...'
                      .format(self.__id))
-        for k, v in self.services.items():
+        for k, v in six.iteritems(self.services):
             matcher, service = v
             logger.debug('StackInABox({0}): Resetting Service {1}'
                          .format(self.__id, service.name))
@@ -133,7 +134,7 @@ def call(self, method, request, uri, headers):
         logger.debug('StackInABox({0}): Received call to {1} - {2}'
                      .format(self.__id, method, uri))
         service_uri = StackInABox.__get_services_url(uri, self.base_url)
-        for k, v in self.services.items():
+        for k, v in six.iteritems(self.services):
             matcher, service = v
             logger.debug('StackInABox({0}): Checking if Service {1} handles...'
                          .format(self.__id, service.name))