Test TLL messages using floats, change --ttl type to FLOAT

Author: borntyping

riemann_client/client.py

@@ -26,8 +26,6 @@ def emit(self, record):
 
 import riemann_client.riemann_pb2
 import riemann_client.transport
-import google.protobuf.descriptor
-
 
 logger = logging.getLogger(__name__)
 logger.addHandler(NullHandler())
@@ -153,9 +151,6 @@ def create_dict(event):
                 value = list(value)
             elif descriptor.name == 'attributes':
                 value = dict(((a.key, a.value) for a in value))
-            elif descriptor.type == \
-                    google.protobuf.descriptor.FieldDescriptor.TYPE_FLOAT:
-                value = round(value, 1)
             data[descriptor.name] = value
 
         return data

riemann_client/command.py

@@ -94,7 +94,7 @@ def main(ctx, host, port, transport_type, timeout, ca_certs):
               help="Event description")
 @click.option('-t', '--tag', type=click.STRING, multiple=True,
               help="Event tag (multiple)")
-@click.option('-l', '--ttl', type=click.INT,
+@click.option('-l', '--ttl', type=click.FLOAT,
               help="Event time to live in seconds")
 @click.option('-a', '--attr', '--attribute', type=Pair(), multiple=True,
               help="Event attribute (key=value, multiple)")

tests/test_riemann_command.py

@@ -34,14 +34,14 @@ def test_send_empty_message():
   },
   "description": "description",
   "host": "%s",
-  "metric_f": 11.1,
+  "metric_f": 11.5,
   "service": "service",
   "state": "state",
   "tags": [
     "tag"
   ],
   "time": 1408030991,
-  "ttl": 120.0
+  "ttl": 120.5
 }
 """ % socket.gethostname()
 
@@ -51,12 +51,12 @@ def test_send():
         u'send',
         u'--attribute', u'key=value',
         u'--description', u'description',
-        u'--metric_f', u'11.1',
+        u'--metric_f', u'11.5',
         u'--service', u'service',
         u'--state', u'state',
         u'--tag', u'tag',
         u'--time', u'1408030991',
-        u'--ttl', u'120'
+        u'--ttl', u'120.5'
     ], POPULATED_MESSAGE)
 
 
@@ -65,12 +65,12 @@ def test_send_short():
         u'send',
         u'-a', u'key=value',
         u'-d', u'description',
-        u'-m', u'11.1',
+        u'-m', u'11.5',
         u'-s', u'service',
         u'-S', u'state',
         u'-t', u'tag',
         u'-T', u'1408030991',
-        u'-l', u'120'
+        u'-l', u'120.5'
     ], POPULATED_MESSAGE)
 
 
@@ -79,12 +79,12 @@ def test_send_noecho():
         'send',
         '--attribute', 'key=value',
         '--description', 'description',
-        '--metric_f', '11.1',
+        '--metric_f', '11.5',
         '--service', 'service',
         '--state', 'state',
         '--tag', 'tag',
         '--time', '1408030991',
-        '--ttl', '120',
+        '--ttl', '120.5',
         '--no-echo'
     ], '')