Merge branch 'ericsong-master'

Author: eddiezane

smtpapi/__init__.py

@@ -51,6 +51,17 @@ def add_section(self, key, section):
     def set_sections(self, value):
         self.data['section'] = value
 
+    def add_send_each_at(self, time):
+        if 'send_each_at' not in self.data:
+          self.data['send_each_at'] = []
+        self.data['send_each_at'].append(time)
+
+    def set_send_each_at(self, time):
+      self.data['send_each_at'] = time
+
+    def set_send_at(self, time):
+      self.data['send_at'] = time
+
     def add_filter(self, app, setting, val):
         if 'filters' not in self.data:
             self.data['filters'] = {}

test/__init__.py

@@ -13,6 +13,8 @@ def setUp(self):
         "category":["testCategory"],
         "unique_args":{"testUnique":"uniqueValue"},
         "asm_group_id":42,
+        "send_each_at":[1409348513, 1409348514],
+        "send_at": 1409348515,
         "filters":{"testFilter":{"settings":{"filter":"filterValue"}}}}''')
 
         self.dropsHeader = json.loads('''{
@@ -29,6 +31,9 @@ def test_add(self):
         header.add_category('testCategory')
         header.add_unique_arg('testUnique', 'uniqueValue')
         header.set_asm_group_id(42)
+        header.add_send_each_at(1409348513)
+        header.add_send_each_at(1409348514)
+        header.set_send_at(1409348515)
         header.add_filter('testFilter', 'filter', 'filterValue')
         self.assertEqual(self.validHeader, json.loads(header.json_string()))
 
@@ -40,6 +45,8 @@ def test_set(self):
         header.set_categories(["testCategory"])
         header.set_unique_args(json.loads('{"testUnique":"uniqueValue"}'))
         header.set_asm_group_id(42)
+        header.set_send_each_at([1409348513, 1409348514])
+        header.set_send_at(1409348515)
         header.add_filter('testFilter', 'filter', 'filterValue')
         self.assertEqual(self.validHeader, json.loads(header.json_string()))
 
@@ -51,6 +58,7 @@ def test_drop_empty(self):
         header.set_categories([])
         header.set_unique_args(json.loads('{"testUnique":"uniqueValue"}'))
         header.set_asm_group_id(None)
+        header.set_send_each_at([])
         header.add_filter('testFilter', 'filter', 'filterValue')
         self.assertEqual(self.dropsHeader, json.loads(header.json_string()))