Mforns has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371972 )
Change subject: Fix graphite tests
......................................................................
Fix graphite tests
Bug: T173345
Change-Id: I48eb59faf41498b2c38b0b1dd266f15955a4e6b0
---
M test/graphite_test.py
1 file changed, 19 insertions(+), 30 deletions(-)
Approvals:
Mforns: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/test/graphite_test.py b/test/graphite_test.py
index 237cdef..a5ad53b 100644
--- a/test/graphite_test.py
+++ b/test/graphite_test.py
@@ -10,10 +10,10 @@
from unittest import TestCase
from datetime import datetime
from mock import call, MagicMock
+import time
class GraphiteTest(TestCase):
-
def setUp(self):
self.config = load_config('test/fixtures/config/graphite_test1.yaml')
@@ -30,22 +30,6 @@
executor = Executor(selector, self.config)
self.writer = Writer(executor, self.config, self.graphite)
- self.report = Report()
- self.report.key = 'graphite_test1'
- self.report.sql_template = 'SOME sql TEMPLATE;'
- self.report.results = {
- 'header': ['date', 'value'],
- 'data': {
- datetime(2015, 1, 1): [datetime(2015, 1, 1), '1']
- }
- }
- self.report_config = self.config['reports'][self.report.key]
- self.report.graphite = self.report_config['graphite']
- self.report.explode_by = {
- 'wiki': 'enwiki',
- 'editor': 'wikitext',
- }
-
def tearDown(self):
self.graphite.record = self.graphite_record_stash
@@ -53,26 +37,31 @@
def test_send_new_dates_to_graphite(self):
- old_date = datetime(2015, 1, 1)
- new_date_1 = datetime(2015, 1, 2)
- new_date_2 = datetime(2015, 1, 3)
- new_row_1 = [new_date_1, 1, 2, 3]
- new_row_2 = [new_date_2, 1, 2, 3]
+ self.report = Report()
+ self.report.key = 'graphite_test1'
self.report.granularity = 'days'
- self.report.start = old_date
+ self.report.graphite =
self.config['reports'][self.report.key]['graphite']
+ self.report.explode_by = {
+ 'wiki': 'enwiki',
+ 'editor': 'wikitext',
+ }
+ self.report.start = datetime(2015, 1, 1)
self.report.results = {
'header': ['date', 'val1', 'val2', 'val3'],
'data': {
- new_date_1: new_row_1,
- new_date_2: new_row_2,
+ datetime(2015, 1, 2): [datetime(2015, 1, 2), 1, 2, 3],
+ datetime(2015, 1, 3): [datetime(2015, 1, 3), 1, 2, 3],
}
}
- header, updated_data, new_dates =
self.writer.update_results(self.report)
+ header, updated_data, new_dates =
self.writer.update_results(self.report)
self.writer.record_to_graphite(self.report, new_dates)
+
+ expected_date1 = time.mktime(datetime(2015, 1, 2).timetuple())
+ expected_date2 = time.mktime(datetime(2015, 1, 3).timetuple())
self.graphite.record.assert_has_calls([
- call('metric_name_one.en.wiki.wikitext', 1, 1420174800.0),
- call('metric_name_two.en.wiki.wikitext', 3, 1420174800.0),
- call('metric_name_one.en.wiki.wikitext', 1, 1420261200.0),
- call('metric_name_two.en.wiki.wikitext', 3, 1420261200.0),
+ call('metric_name_one.en.wiki.wikitext', 1, expected_date1),
+ call('metric_name_two.en.wiki.wikitext', 3, expected_date1),
+ call('metric_name_one.en.wiki.wikitext', 1, expected_date2),
+ call('metric_name_two.en.wiki.wikitext', 3, expected_date2),
], any_order=True)
--
To view, visit https://gerrit.wikimedia.org/r/371972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48eb59faf41498b2c38b0b1dd266f15955a4e6b0
Gerrit-PatchSet: 1
Gerrit-Project: analytics/reportupdater
Gerrit-Branch: master
Gerrit-Owner: Mforns <mfo...@wikimedia.org>
Gerrit-Reviewer: Mforns <mfo...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
