DIP-279 Fixed frozen_datetime for Travis CI

janrain · Jun 10, 2016 · db18025 · db18025
1 parent 21b392e
commit db18025
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/tests/test_bluekai_writter.py b/tests/test_bluekai_writter.py
@@ -1,10 +1,13 @@
 from unittest import TestCase
+from datetime import datetime
 from mock import MagicMock
 from mock import call
 from bluekai.bluekai_writter import *
 from freezegun import freeze_time
 
-@freeze_time("2016-01-02 12:00:01")
+frozen_datetime="2016-01-02 12:00:01"
+
+@freeze_time(frozen_datetime)
 class bluekai_writter_test(TestCase):
 
   def setUp(self):
@@ -18,18 +21,19 @@ def setUp(self):
     }
     self.bluekai_writter = BlueKaiWritter(self.writter_mock, self.config)
     self.valid_data = "abc\ta=1|b=2\nefg\ta=10|b=20\n"
+    self.date = datetime.now().timestamp()
 
   def test_init(self):
     self.writter_mock.file.assert_has_calls([
-      call('partnername_clientname_siteid_1451764801.0.bzip2', mode='w'),
-      call('partnername_clientname_siteid_1451764801.0.bzip2.trigger', mode='w'),
+      call('partnername_clientname_siteid_{}.bzip2'.format(self.date), mode='w'),
+      call('partnername_clientname_siteid_{}.bzip2.trigger'.format(self.date), mode='w'),
     ])
 
   def test_write(self):
     self.bluekai_writter.write(self.valid_data)
     self.file_mock.assert_has_calls([
       call.write('abc\ta=1|b=2\nefg\ta=10|b=20\n'),
-      call.write('FILE=partnername_clientname_siteid_1451764801.0.bzip2\nSIZE=26\nMD5SUM=5309154b2b0cd3ae147a0d5f4f39da31')
+      call.write('FILE=partnername_clientname_siteid_{}.bzip2\nSIZE=26\nMD5SUM=5309154b2b0cd3ae147a0d5f4f39da31'.format(self.date))
     ])
 
   def test_close(self):

diff --git a/tests/test_config.py b/tests/test_config.py
@@ -1,10 +1,13 @@
 # -*- coding: utf-8 -*-
 from unittest import TestCase
+from datetime import datetime
 from mock import patch
 from bluekai.config import *
 from bluekai.config import _ENV_VARS
 from freezegun import freeze_time
 
+frozen_datetime="2016-01-02 12:00:01"
+
 class getConfigTests(TestCase):
 
     @patch('os.getenv')
@@ -59,27 +62,33 @@ def test_invalid_dict(self, getenv_mock):
         config = get_config()
         self.assertEqual(config['DICT'], {})
 
+@freeze_time(frozen_datetime)
 class remoteFilenameTests(TestCase):
 
-    frozen_datetime="2016-01-02 12:00:01"
+    def setUp(self):
+        self.date = datetime.now().timestamp()
 
-    @freeze_time(frozen_datetime)
     def test_with_clientName(self):
         config = {
             'BLUEKAI_PARTNERNAME': "partnername",
             'BLUEKAI_CLIENTNAME': 'clientname',
             'BLUEKAI_SITEID': 'siteid',
         }
         actual = remote_filename(config)
-        expected = ("partnername_clientname_siteid_1451764801.0.bzip2", "partnername_clientname_siteid_1451764801.0.bzip2.trigger")
+        expected = (
+            "partnername_clientname_siteid_{}.bzip2".format(self.date),
+            "partnername_clientname_siteid_{}.bzip2.trigger".format(self.date)
+        )
         self.assertEqual(actual, expected)
 
-    @freeze_time(frozen_datetime)
     def test_without_clientName(self):
         config = {
             'BLUEKAI_PARTNERNAME': "partnername",
             'BLUEKAI_SITEID': 'siteid',
         }
         actual = remote_filename(config)
-        expected = ("partnername_siteid_1451764801.0.bzip2", "partnername_siteid_1451764801.0.bzip2.trigger")
+        expected = (
+            "partnername_siteid_{}.bzip2".format(self.date),
+            "partnername_siteid_{}.bzip2.trigger".format(self.date)
+        )
         self.assertEqual(actual, expected)