1
1
# -*- coding: utf-8 -*-
2
2
3
- import datetime
4
- import pytz
5
3
import sys
6
4
if sys .version_info < (2 , 7 ):
7
5
import unittest2 as unittest
@@ -40,18 +38,6 @@ class Meta:
40
38
41
39
TestSeriesHelper .MySeriesHelper = MySeriesHelper
42
40
43
- class MySeriesTimeHelper (SeriesHelper ):
44
-
45
- class Meta :
46
- client = TestSeriesHelper .client
47
- series_name = 'events.stats.{server_name}'
48
- fields = ['time' , 'some_stat' ]
49
- tags = ['server_name' , 'other_tag' ]
50
- bulk_size = 5
51
- autocommit = True
52
-
53
- TestSeriesHelper .MySeriesTimeHelper = MySeriesTimeHelper
54
-
55
41
def test_auto_commit (self ):
56
42
"""
57
43
Tests that write_points is called after the right number of events
@@ -80,20 +66,14 @@ def testSingleSeriesName(self):
80
66
"""
81
67
Tests JSON conversion when there is only one series name.
82
68
"""
83
- dt = datetime .datetime (2016 , 1 , 2 , 3 , 4 , 5 , 678912 )
84
- ts1 = dt
85
- ts2 = "2016-10-11T01:02:03.123456789-04:00"
86
- ts3 = 1234567890123456789
87
- ts4 = pytz .timezone ("Europe/Berlin" ).localize (dt )
88
-
89
- TestSeriesHelper .MySeriesTimeHelper (
90
- time = ts1 , server_name = 'us.east-1' , other_tag = 'ello' , some_stat = 159 )
91
- TestSeriesHelper .MySeriesTimeHelper (
92
- time = ts2 , server_name = 'us.east-1' , other_tag = 'ello' , some_stat = 158 )
93
- TestSeriesHelper .MySeriesTimeHelper (
94
- time = ts3 , server_name = 'us.east-1' , other_tag = 'ello' , some_stat = 157 )
95
- TestSeriesHelper .MySeriesTimeHelper (
96
- time = ts4 , server_name = 'us.east-1' , other_tag = 'ello' , some_stat = 156 )
69
+ TestSeriesHelper .MySeriesHelper (
70
+ server_name = 'us.east-1' , other_tag = 'ello' , some_stat = 159 )
71
+ TestSeriesHelper .MySeriesHelper (
72
+ server_name = 'us.east-1' , other_tag = 'ello' , some_stat = 158 )
73
+ TestSeriesHelper .MySeriesHelper (
74
+ server_name = 'us.east-1' , other_tag = 'ello' , some_stat = 157 )
75
+ TestSeriesHelper .MySeriesHelper (
76
+ server_name = 'us.east-1' , other_tag = 'ello' , some_stat = 156 )
97
77
expectation = [
98
78
{
99
79
"measurement" : "events.stats.us.east-1" ,
@@ -104,7 +84,6 @@ def testSingleSeriesName(self):
104
84
"fields" : {
105
85
"some_stat" : 159
106
86
},
107
- "time" : "2016-01-02T03:04:05.678912+00:00" ,
108
87
},
109
88
{
110
89
"measurement" : "events.stats.us.east-1" ,
@@ -115,7 +94,6 @@ def testSingleSeriesName(self):
115
94
"fields" : {
116
95
"some_stat" : 158
117
96
},
118
- "time" : "2016-10-11T01:02:03.123456789-04:00" ,
119
97
},
120
98
{
121
99
"measurement" : "events.stats.us.east-1" ,
@@ -126,7 +104,6 @@ def testSingleSeriesName(self):
126
104
"fields" : {
127
105
"some_stat" : 157
128
106
},
129
- "time" : 1234567890123456789 ,
130
107
},
131
108
{
132
109
"measurement" : "events.stats.us.east-1" ,
@@ -137,24 +114,23 @@ def testSingleSeriesName(self):
137
114
"fields" : {
138
115
"some_stat" : 156
139
116
},
140
- "time" : "2016-01-02T03:04:05.678912+01:00" ,
141
117
}
142
118
]
143
119
144
- rcvd = TestSeriesHelper .MySeriesTimeHelper ._json_body_ ()
120
+ rcvd = TestSeriesHelper .MySeriesHelper ._json_body_ ()
145
121
self .assertTrue (all ([el in expectation for el in rcvd ]) and
146
122
all ([el in rcvd for el in expectation ]),
147
123
'Invalid JSON body of time series returned from '
148
124
'_json_body_ for one series name: {0}.' .format (rcvd ))
149
- TestSeriesHelper .MySeriesTimeHelper ._reset_ ()
125
+ TestSeriesHelper .MySeriesHelper ._reset_ ()
150
126
self .assertEqual (
151
- TestSeriesHelper .MySeriesTimeHelper ._json_body_ (),
127
+ TestSeriesHelper .MySeriesHelper ._json_body_ (),
152
128
[],
153
129
'Resetting helper did not empty datapoints.' )
154
130
155
131
def testSeveralSeriesNames (self ):
156
132
'''
157
- Tests JSON conversion when there are multiple series names .
133
+ Tests JSON conversion when there is only one series name .
158
134
'''
159
135
TestSeriesHelper .MySeriesHelper (
160
136
server_name = 'us.east-1' , some_stat = 159 , other_tag = 'ello' )
@@ -208,10 +184,6 @@ def testSeveralSeriesNames(self):
208
184
]
209
185
210
186
rcvd = TestSeriesHelper .MySeriesHelper ._json_body_ ()
211
- for r in rcvd :
212
- self .assertTrue (r .get ('time' ),
213
- "No time field in received JSON body." )
214
- del (r ["time" ])
215
187
self .assertTrue (all ([el in expectation for el in rcvd ]) and
216
188
all ([el in rcvd for el in expectation ]),
217
189
'Invalid JSON body of time series returned from '
0 commit comments