Merge pull request #17 from EvaSDK/unittest-cleanup

Unittest cleanup

Author: kzk

.coveragerc

@@ -0,0 +1,8 @@
+# http://nedbatchelder.com/code/coverage/config.html#config
+
+[run]
+branch = True
+omit = */tests/*
+
+[report]
+omit = */tests/*

.travis.yml

@@ -0,0 +1,15 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
+install:
+    - "pip install --use-mirrors -e ."
+    - "pip install coverage coveralls"
+script:
+    - "python ./setup.py nosetests"
+after_success:
+    - coveralls

README.md

@@ -1,5 +1,7 @@
 # A Python structured logger for Fluentd
 
+[![Build Status](https://travis-ci.org/EvaSDK/fluent-logger-python.svg?branch=master)](https://travis-ci.org/EvaSDK/fluent-logger-python)
+[![Coverage Status](https://coveralls.io/repos/EvaSDK/fluent-logger-python/badge.png)](https://coveralls.io/r/EvaSDK/fluent-logger-python)
 
 Many web/mobile applications generate huge amount of event logs (c,f. login, logout, purchase, follow, etc). To analyze these event logs could be really valuable for improving the service. However, the challenge is collecting these logs easily and reliably.
 

fluent/handler.py

@@ -5,9 +5,14 @@
 
 try:
     import simplejson as json
-except ImportError:
+except ImportError:  # pragma: no cover
     import json
 
+try:
+    basestring
+except NameError:  # pragma: no cover
+    basestring = (str, bytes)
+
 from fluent import sender
 
 
@@ -75,4 +80,4 @@ def close(self):
             self.sender._close()
             logging.Handler.close(self)
         finally:
-            self.release()
+            self.release()

run_tests.py

@@ -0,0 +1,8 @@
+[nosetests]
+match = ^test_
+cover-package = fluent
+with-coverage = 1
+cover-erase = 1
+cover-branches = 1
+cover-inclusive = 1
+cover-min-percentage = 70

setup.cfg

@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from tests.test_event import *
-from tests.test_handler import *
-from tests.test_sender import *
-from tests.test_unix_domain_socket_sender import *

tests/__init__.py

@@ -9,7 +9,7 @@
 
 
 class TestEvent(unittest.TestCase):
-    def testLogging(self):
+    def test_logging(self):
         # send event with tag app.follow
         event.Event('follow', {
             'from': 'userA',

tests/test_event.py

@@ -42,5 +42,5 @@ def test_simple(self):
         eq('app.follow', data[0][0])
         eq('userA', data[0][2]['from'])
         eq('userB', data[0][2]['to'])
-        self.assert_(data[0][1])
-        self.assert_(isinstance(data[0][1], int))
+        self.assertTrue(data[0][1])
+        self.assertTrue(isinstance(data[0][1], int))

tests/test_handler.py

@@ -32,5 +32,5 @@ def test_simple(self):
         eq(3, len(data[0]))
         eq('test.foo', data[0][0])
         eq({'bar': 'baz'}, data[0][2])
-        self.assert_(data[0][1])
-        self.assert_(isinstance(data[0][1], int))
+        self.assertTrue(data[0][1])
+        self.assertTrue(isinstance(data[0][1], int))