Fix Windows unittests and color output

pyresttest/resttest.py

@@ -856,6 +856,16 @@ def main(args):
 
         if 'skip_term_colors' in args and args['skip_term_colors'] is not None:
             t.config.skip_term_colors = safe_to_bool(args['skip_term_colors'])
+            if not t.config.skip_term_colors:
+                try:
+                    from colorama import init as colorama_init
+                except ImportError:
+                    if sys.platform == 'win32':
+                        logger.warn('Terminal colors on Windows require the colorama package. '
+                                    '`pip install colorama` to enable. Colors will be disabled.')
+                        t.config.skip_term_colors = True
+                else:  # run colorama_init() only if the import was successful
+                    colorama_init()
 
     # Execute all testsets
     failures = run_testsets(tests)

pyresttest/test_contenthandling.py

@@ -138,7 +138,7 @@ def test_parse_content_file(self):
         """ Test parsing of file content """
         node = {'file': '/myval'}
         handler = ContentHandler.parse_content(node)
-        self.assertEqual(node['file'], handler.content)
+        self.assertEqual(os.path.abspath(node['file']), handler.content)
         self.assertFalse(handler.is_dynamic())
         self.assertTrue(handler.is_file)
         self.assertFalse(handler.is_template_path)
@@ -169,7 +169,7 @@ def test_parse_content_templated_file_path(self):
         """ Test parsing of templated file path """
         node = {'file': {'template': '/$host-path.yaml'}}
         handler = ContentHandler.parse_content(node)
-        self.assertEqual('/$host-path.yaml', handler.content)
+        self.assertEqual(os.path.abspath('/$host-path.yaml'), handler.content)
         self.assertTrue(handler.is_dynamic())
         self.assertTrue(handler.is_file)
         self.assertTrue(handler.is_template_path)
@@ -179,7 +179,7 @@ def test_parse_content_templated_file_content(self):
         """ Test parsing of templated file content """
         node = {'template': {'file': '/path.yaml'}}
         handler = ContentHandler.parse_content(node)
-        self.assertEqual('/path.yaml', handler.content)
+        self.assertEqual(os.path.abspath('/path.yaml'), handler.content)
         self.assertTrue(handler.is_dynamic())
         self.assertTrue(handler.is_file)
         self.assertFalse(handler.is_template_path)
@@ -189,7 +189,7 @@ def test_parse_content_double_templated_file(self):
         """ Test parsing of file with path and content templated """
         node = {'template': {'file': {'template': '/$var-path.yaml'}}}
         handler = ContentHandler.parse_content(node)
-        self.assertEqual('/$var-path.yaml', handler.content)
+        self.assertEqual(os.path.abspath('/$var-path.yaml'), handler.content)
         self.assertTrue(handler.is_dynamic())
         self.assertTrue(handler.is_file)
         self.assertTrue(handler.is_template_path)

setup.py

@@ -5,7 +5,7 @@
     from distutils.core import setup
 
 # Future is needed for pip distribution for python 3 support
-dependencies = ['pyyaml', 'pycurl']
+dependencies = ['pyyaml', 'pycurl', 'colorama;platform_system=="Windows"']
 test_dependencies = ['django==1.6.5','django-tastypie==0.12.1','jsonpath','jmespath']
 
 # Add additional compatibility shims