User-set timestamps now assumed to be in milliseconds

snowplow · Apr 22, 2014 · 86d5e5f · 86d5e5f
1 parent 98a5244
commit 86d5e5f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/snowplow_tracker/payload.py b/snowplow_tracker/payload.py
@@ -62,9 +62,9 @@ def set_timestamp(self, tstamp=None):
             :param  tstamp:         Timestamp value
         """
         if tstamp is None:
-            tstamp = time.time()
-        if tstamp and isinstance(tstamp, (int, float)):
-            value = int(tstamp * 1000)
+            value = int(time.time() * 1000)
+        elif tstamp and isinstance(tstamp, (int, float)):
+            value = int(tstamp)
         else:
             value = tstamp
         self.context["dtm"] = value

diff --git a/snowplow_tracker/test/integration/test_integration.py b/snowplow_tracker/test/integration/test_integration.py
@@ -68,7 +68,7 @@ def test_integration_ecommerce_transaction_item(self):
     def test_integration_ecommerce_transaction(self):
         t = tracker.Tracker("localhost")
         with HTTMock(pass_response_content):
-            t.track_ecommerce_transaction("6a8078be", 45, city="London", currency="GBP", items=
+            t.track_ecommerce_transaction("6a8078be", 35, city="London", currency="GBP", items=
                 [{  
                     "sku": "pbz0026",
                     "price": 20,
@@ -80,7 +80,7 @@ def test_integration_ecommerce_transaction(self):
                     "quantity": 1  
                 }])
 
-            expected_fields = {"e": "tr", "tr_id": "6a8078be", "tr_tt": "45", "tr_ci": "London", "tr_cu": "GBP"}
+            expected_fields = {"e": "tr", "tr_id": "6a8078be", "tr_tt": "35", "tr_ci": "London", "tr_cu": "GBP"}
             for key in expected_fields:
                 self.assertEquals(from_querystring(key, querystrings[-3]), expected_fields[key])
 

diff --git a/snowplow_tracker/test/unit/test_payload.py b/snowplow_tracker/test/unit/test_payload.py
@@ -86,7 +86,7 @@ def test_set_timestamp_2(self):
 
     def test_set_timestamp(self):
         p = payload.Payload()
-        p.set_timestamp(12345654321)
+        p.set_timestamp(12345654321000)
         self.assertEquals(p.context["dtm"], 12345654321000)
 
     def test_add_unstruct_1(self):

diff --git a/snowplow_tracker/tracker.py b/snowplow_tracker/tracker.py
@@ -100,7 +100,7 @@ def http_get(self, payload):
         r = requests.get(self.collector_uri, params=payload.context)
         code = r.status_code
         if code in HTTP_ERRORS:
-            return (False, "Host [" + r.url + "] not found (possible connectivity error")
+            return (False, "Host [" + r.url + "] not found (possible connectivity error)")
         elif code < 0 or code > 600:
             return (False, code)
         elif code >= 400 and code < 500: