- add tests

Author: zzzeek

.gitignore

@@ -6,6 +6,8 @@
 /docs/build/output/
 *.orig
 *,cover
+.cache
+.eggs
 /.tox
 .venv
 *.egg-info

setup.cfg

@@ -1,8 +1,9 @@
 [egg_info]
 
-[pytest]
+[tool:pytest]
 addopts= --tb native -v -r fxX --ignore=sqlalchemy
 python_files=sqlalchemy_collectd/*/test_*.py
 
 
-
+[aliases]
+test=pytest

setup.py

@@ -35,8 +35,10 @@
     author_email='[email protected]',
     url='http://github.org/zzzeek/sqlalchemy-collectd',
     license='MIT',
-    packages=["sqlalchemy_collectd"],
+    packages=find_packages(".", exclude=["*.tests"]),
     include_package_data=True,
+    tests_require=['pytest', 'mock'],
+    setup_requires=['pytest-runner'],
     zip_safe=False,
     install_requires=requires,
 )

sqlalchemy_collectd/connection.py renamed to sqlalchemy_collectd/collectd.py

@@ -111,13 +111,14 @@ def __init__(
         )
 
     def _pack_string(self, typecode, value):
-        return struct.pack("!HH", typecode, 5 + len(value)) + value + b"\0"
+        return struct.pack(
+            "!HH", typecode, 5 + len(value)) + value.encode('ascii') + b"\0"
 
     def send(self, connection, timestamp, *values):
         """Send a message on a connection."""
 
         header = self._host_message_part + \
-            struct.pack("!HHq", TYPE_TIME, 12, timestamp) + \
+            struct.pack("!HHq", TYPE_TIME, 12, int(timestamp)) + \
             self._remainder_message_parts
 
         payload = self.type.encode_values(*values)

sqlalchemy_collectd/tests/__init__.py

@@ -0,0 +1,44 @@
+import mock
+import unittest
+
+from sqlalchemy_collectd import collectd
+
+
+class CollectDProtocolTest(unittest.TestCase):
+
+    def test_encode_type_values(self):
+        type_ = collectd.Type(
+            "my_type",
+            ("some_val", collectd.VALUE_GAUGE),
+            ("some_other_val", collectd.VALUE_DERIVE)
+        )
+
+        self.assertEqual(
+            b'\x00\x06\x00\x18\x00\x02\x01\x02\xc9v\xbe\x9f\x1a\xcf9'
+            b'@\x00\x00\x00\x00\x00\x00\x01\xc2',
+            type_.encode_values(25.809, 450)
+        )
+
+    def test_message_construct(self):
+        type_ = collectd.Type(
+            "my_type",
+            ("some_val", collectd.VALUE_GAUGE),
+            ("some_other_val", collectd.VALUE_DERIVE)
+        )
+
+        sender = collectd.MessageSender(
+            type_, "somehost", "someplugin", "someplugininstance",
+            "sometypeinstance"
+        )
+
+        connection = mock.Mock()
+
+        sender.send(connection, 1517607042.95968, 25.809, 450)
+
+        self.assertEqual(
+            [
+                mock.call(b'\x00\x00\x00\rsomehost\x00\x00\x01\x00\x0c\x00\x00\x00\x00Zt\xd8\x82\x00\x02\x00\x0fsomeplugin\x00\x00\x03\x00\x17someplugininstance\x00\x00\x04\x00\x0cmy_type\x00\x00\x07\x00\x0c\x00\x00\x00\x00\x00\x00\x00\n\x00\x05\x00\x15sometypeinstance\x00\x00\x06\x00\x18\x00\x02\x01\x02\xc9v\xbe\x9f\x1a\xcf9@\x00\x00\x00\x00\x00\x00\x01\xc2')
+            ],
+            connection.send.mock_calls
+        )
+