Merge pull request fluent#36 from hirokiky/feature-tolerant-setup

repeatedly · repeatedly · commit 2a62230d31ab · 2016-04-14T05:41:15.000+09:00
sender.setup should accept more various of options
diff --git a/fluent/sender.py b/fluent/sender.py
@@ -11,12 +11,16 @@
 _global_sender = None
 
 
-def setup(tag, **kwargs):
-    host = kwargs.get('host', 'localhost')
-    port = kwargs.get('port', 24224)
+def _set_global_sender(sender):
+    """ [For testing] Function to set global sender directly
+    """
+    global _global_sender
+    _global_sender = sender
 
+
+def setup(tag, **kwargs):
     global _global_sender
-    _global_sender = FluentSender(tag, host=host, port=port)
+    _global_sender = FluentSender(tag, **kwargs)
 
 
 def get_global_sender():
@@ -30,7 +34,8 @@ def __init__(self,
                  port=24224,
                  bufmax=1 * 1024 * 1024,
                  timeout=3.0,
-                 verbose=False):
+                 verbose=False,
+                 **kwargs):
 
         self.tag = tag
         self.host = host
diff --git a/tests/test_sender.py b/tests/test_sender.py
@@ -8,6 +8,36 @@
 from tests import mockserver
 
 
+class TestSetup(unittest.TestCase):
+    def tearDown(self):
+        from fluent.sender import _set_global_sender
+        _set_global_sender(None)
+
+    def test_no_kwargs(self):
+        fluent.sender.setup("tag")
+        actual = fluent.sender.get_global_sender()
+        self.assertEqual(actual.tag, "tag")
+        self.assertEqual(actual.host, "localhost")
+        self.assertEqual(actual.port, 24224)
+        self.assertEqual(actual.timeout, 3.0)
+
+    def test_host_and_port(self):
+        fluent.sender.setup("tag", host="myhost", port=24225)
+        actual = fluent.sender.get_global_sender()
+        self.assertEqual(actual.tag, "tag")
+        self.assertEqual(actual.host, "myhost")
+        self.assertEqual(actual.port, 24225)
+        self.assertEqual(actual.timeout, 3.0)
+
+    def test_tolerant(self):
+        fluent.sender.setup("tag", host="myhost", port=24225, timeout=1.0)
+        actual = fluent.sender.get_global_sender()
+        self.assertEqual(actual.tag, "tag")
+        self.assertEqual(actual.host, "myhost")
+        self.assertEqual(actual.port, 24225)
+        self.assertEqual(actual.timeout, 1.0)
+
+
 class TestSender(unittest.TestCase):
     def setUp(self):
         super(TestSender, self).setUp()
