Fixing test suite

Author: otobrglez

databox test/test_push.py

@@ -19,55 +19,72 @@ def test_push(self):
         assert self.client.push("templj", 10.0) is True
         assert self.client.push("templj", 12.0, date="2015-01-01 09:00:00") is True
 
-    def test_push_validation(self):
-        self.assertRaises(
-            Client.KPIValidationException,
-            lambda: self.client.push(None, None)
-        )
-
-    def test_insert_all(self):
-        assert self.client.insert_all([
-            {'key': 'templj', 'value': 83.3},
+    def test_push_with_attributes(self):
+        self.client._push_json = lambda data=None, path='/': dict({
+                                                                      'status': 'ok',
+                                                                  }.items() + data.items())
+
+        push = self.client.push("meta", 100, attributes={
+            'n': 100
+        })
+
+        assert self.client.last_push_content['data'][0]['$meta'] == 100
+        assert self.client.last_push_content['data'][0]['n'] == 100
+
+
+def test_push_validation(self):
+    self.assertRaises(
+        Client.KPIValidationException,
+        lambda: self.client.push(None, None)
+    )
+
+
+def test_insert_all(self):
+    assert self.client.insert_all([
+        {'key': 'templj', 'value': 83.3},
+        {'key': 'templj', 'value': 83.3, 'date': "2015-01-01 09:00:00"},
+        {'key': 'templj', 'value': 12.3},
+    ]) is True
+
+    self.assertRaises(
+        Client.KPIValidationException,
+        lambda: self.client.insert_all([
+            {'value': 83.3},
             {'key': 'templj', 'value': 83.3, 'date': "2015-01-01 09:00:00"},
             {'key': 'templj', 'value': 12.3},
-        ]) is True
-
-        self.assertRaises(
-            Client.KPIValidationException,
-            lambda: self.client.insert_all([
-                {'value': 83.3},
-                {'key': 'templj', 'value': 83.3, 'date': "2015-01-01 09:00:00"},
-                {'key': 'templj', 'value': 12.3},
-            ])
-        )
-
-    def test_last_push(self):
-        self.client._push_json = lambda data=None, path='/': {
-            'err': [],
-            'no_err': 0
-        }
-
-        assert self.client.last_push()['err'] == []
-
-    def test_last_push_with_number(self):
-        self.client._push_json = lambda data=None, path='/': path
-        assert self.client.last_push(3) == '/lastpushes/3'
-
-    def test_short(self):
-        Client._push_json = mock_push_json
-
-        assert push("templj", 22, token=self.databox_push_token) is True
-
-        assert insert_all([
-            {
-                'key': 'templj',
-                'value': 83.3
-            },
-        ], token=self.databox_push_token) is True
-
-        Client._push_json = lambda data=None, path='/': {
-            'err': [],
-            'no_err': 0
-        }
-
-        assert last_push(token=self.databox_push_token)['err'] == []
+        ])
+    )
+
+
+def test_last_push(self):
+    self.client._push_json = lambda data=None, path='/': {
+        'err': [],
+        'no_err': 0
+    }
+
+    assert self.client.last_push()['err'] == []
+
+
+def test_last_push_with_number(self):
+    self.client._push_json = lambda data=None, path='/': path
+    assert self.client.last_push(3) == '/lastpushes/3'
+
+
+def test_short(self):
+    Client._push_json = mock_push_json
+
+    assert push("templj", 22, token=self.databox_push_token) is True
+
+    assert insert_all([
+                          {
+                              'key': 'templj',
+                              'value': 83.3
+                          },
+                      ], token=self.databox_push_token) is True
+
+    Client._push_json = lambda data=None, path='/': {
+        'err': [],
+        'no_err': 0
+    }
+
+    assert last_push(token=self.databox_push_token)['err'] == []

databox/__init__.py

@@ -7,6 +7,7 @@
 class Client(object):
     push_token = None
     push_host = 'https://push2new.databox.com'
+    last_push_content = None
 
     class MissingToken(Exception):
         pass
@@ -58,15 +59,28 @@ def _push_json(self, data=None, path="/"):
 
         return response.json()
 
-    def push(self, key, value, date=None):
-        return self._push_json({
-            'data': [self.process_kpi(key=key, value=value, date=date)]
-        })['status'] == 'ok'
+
+    def push(self, key, value, date=None, attributes=None):
+        self.last_push_content = self._push_json({
+            'data': [self.process_kpi(
+                key=key,
+                value=value,
+                date=date,
+                attributes=attributes
+            )]
+        })
+
+        return self.last_push_content['status'] == 'ok'
+
+
 
     def insert_all(self, rows):
-        return self._push_json({
+        self.last_push_content = self._push_json({
             'data': [self.process_kpi(**row) for row in rows]
-        })['status'] == 'ok'
+        })
+
+        return self.last_push_content['status'] == 'ok'
+
 
     def last_push(self, number=1):
         return self._push_json(path='/lastpushes/{n}'.format(**{'n': number}))