[MediaWiki-commits] [Gerrit] re-organizing the return value of report nodes - change (analytics/wikimetrics)

2013-08-16 Thread Milimetric (Code Review) 
Milimetric has submitted this change and it was merged.

Change subject: re-organizing the return value of report nodes
..


re-organizing the return value of report nodes

Change-Id: Iea50bfc69841e9efe530fb1d92be27ffa8d20690
---
M tests/fixtures.py
M tests/test_models/test_report_response.py
M wikimetrics/controllers/reports.py
M wikimetrics/models/persistent_report.py
M wikimetrics/models/report_nodes/aggregate_report.py
D wikimetrics/models/report_nodes/concat_metrics_report.py
M wikimetrics/models/report_nodes/multi_project_metric_report.py
M wikimetrics/models/report_nodes/report.py
M wikimetrics/models/report_nodes/run_report.py
M wikimetrics/run.py
10 files changed, 192 insertions(+), 173 deletions(-)

Approvals:
  Milimetric: Verified; Looks good to me, approved



diff --git a/tests/fixtures.py b/tests/fixtures.py
index 4f3da64..b24a02e 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -252,25 +252,25 @@
 report_created = PersistentReport(
 user_id=web_test_user.id,
 status=celery.states.PENDING,
-result_key=None,
+queue_result_key=None,
 show_in_ui=True
 )
 report_started = PersistentReport(
 user_id=web_test_user.id,
 status=celery.states.STARTED,
-result_key=None,
+queue_result_key=None,
 show_in_ui=True
 )
 report_started2 = PersistentReport(
 user_id=web_test_user.id,
 status=celery.states.STARTED,
-result_key=None,
+queue_result_key=None,
 show_in_ui=True
 )
 report_finished = PersistentReport(
 user_id=web_test_user.id,
 status=celery.states.SUCCESS,
-result_key=None,
+queue_result_key=None,
 show_in_ui=True
 )
 self.session.add_all([
diff --git a/tests/test_models/test_report_response.py 
b/tests/test_models/test_report_response.py
index 254ba56..f356b62 100644
--- a/tests/test_models/test_report_response.py
+++ b/tests/test_models/test_report_response.py
@@ -1,7 +1,10 @@
-from wikimetrics.models import Cohort, RunReport, MultiProjectMetricReport, 
Aggregation
+from nose.tools import assert_equals, assert_true
+from celery.exceptions import SoftTimeLimitExceeded
+from wikimetrics.models import (
+Cohort, RunReport, MultiProjectMetricReport, Aggregation, PersistentReport
+)
 from wikimetrics.metrics import NamespaceEdits
 from ..fixtures import QueueDatabaseTest
-from nose.tools import assert_equals, assert_true
 
 
 class RunReportTest(QueueDatabaseTest):
@@ -20,7 +23,7 @@
 },
 'metric': {
 'name': 'NamespaceEdits',
-'namespaces': [0,1,2],
+'namespaces': [0, 1, 2],
 'start_date': '2013-06-01',
 'end_date': '2013-09-01',
 'individualResults': True,
@@ -31,7 +34,12 @@
 },
 }]
 jr = RunReport(desired_responses, user_id=self.test_user_id)
-results = jr.task.delay(jr).get()[0]
+results = jr.task.delay(jr).get()
+result_key = self.session.query(PersistentReport)\
+.filter(PersistentReport.id == jr.children[0].persistent_id)\
+.one()\
+.result_key
+results = results[result_key]
 # TODO: figure out why one of the resulting wiki_user_ids is None here
 assert_equals(
 results[Aggregation.IND][0][self.test_mediawiki_user_id]['edits'],
@@ -46,7 +54,7 @@
 },
 'metric': {
 'name': 'NamespaceEdits',
-'namespaces': [0,1,2],
+'namespaces': [0, 1, 2],
 'start_date': '2013-06-01',
 'end_date': '2013-09-01',
 'individualResults': True,
@@ -57,7 +65,12 @@
 },
 }]
 jr = RunReport(desired_responses, user_id=self.test_user_id)
-results = jr.task.delay(jr).get()[0]
+results = jr.task.delay(jr).get()
+result_key = self.session.query(PersistentReport)\
+.filter(PersistentReport.id == jr.children[0].persistent_id)\
+.one()\
+.result_key
+results = results[result_key]
 assert_equals(
 results[Aggregation.IND][0][self.test_mediawiki_user_id]['edits'],
 2,
@@ -76,7 +89,7 @@
 },
 'metric': {
 'name': 'BytesAdded',
-'namespaces': [0,1,2],
+'namespaces': [0, 1, 2],
 'start_date': '2013-06-01',
 'end_date': '2013-09-01',
 'individualResults': True,
@@ -87,8 +100,12 @@
 },
 }]
 jr = RunReport(desired_responses, user_id=self.test_user_id)
-results = jr.task.delay(jr).get()[0]
-print(results)
+

[MediaWiki-commits] [Gerrit] re-organizing the return value of report nodes - change (analytics/wikimetrics)

2013-08-16 Thread Milimetric (Code Review) 
Milimetric has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/79429


Change subject: re-organizing the return value of report nodes
..

re-organizing the return value of report nodes

Change-Id: Iea50bfc69841e9efe530fb1d92be27ffa8d20690
---
M tests/fixtures.py
M tests/test_models/test_report_response.py
M wikimetrics/controllers/reports.py
M wikimetrics/models/persistent_report.py
M wikimetrics/models/report_nodes/aggregate_report.py
D wikimetrics/models/report_nodes/concat_metrics_report.py
M wikimetrics/models/report_nodes/multi_project_metric_report.py
M wikimetrics/models/report_nodes/report.py
M wikimetrics/models/report_nodes/run_report.py
M wikimetrics/run.py
10 files changed, 192 insertions(+), 173 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics 
refs/changes/29/79429/1

diff --git a/tests/fixtures.py b/tests/fixtures.py
index 4f3da64..b24a02e 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -252,25 +252,25 @@
 report_created = PersistentReport(
 user_id=web_test_user.id,
 status=celery.states.PENDING,
-result_key=None,
+queue_result_key=None,
 show_in_ui=True
 )
 report_started = PersistentReport(
 user_id=web_test_user.id,
 status=celery.states.STARTED,
-result_key=None,
+queue_result_key=None,
 show_in_ui=True
 )
 report_started2 = PersistentReport(
 user_id=web_test_user.id,
 status=celery.states.STARTED,
-result_key=None,
+queue_result_key=None,
 show_in_ui=True
 )
 report_finished = PersistentReport(
 user_id=web_test_user.id,
 status=celery.states.SUCCESS,
-result_key=None,
+queue_result_key=None,
 show_in_ui=True
 )
 self.session.add_all([
diff --git a/tests/test_models/test_report_response.py 
b/tests/test_models/test_report_response.py
index 254ba56..f356b62 100644
--- a/tests/test_models/test_report_response.py
+++ b/tests/test_models/test_report_response.py
@@ -1,7 +1,10 @@
-from wikimetrics.models import Cohort, RunReport, MultiProjectMetricReport, 
Aggregation
+from nose.tools import assert_equals, assert_true
+from celery.exceptions import SoftTimeLimitExceeded
+from wikimetrics.models import (
+Cohort, RunReport, MultiProjectMetricReport, Aggregation, PersistentReport
+)
 from wikimetrics.metrics import NamespaceEdits
 from ..fixtures import QueueDatabaseTest
-from nose.tools import assert_equals, assert_true
 
 
 class RunReportTest(QueueDatabaseTest):
@@ -20,7 +23,7 @@
 },
 'metric': {
 'name': 'NamespaceEdits',
-'namespaces': [0,1,2],
+'namespaces': [0, 1, 2],
 'start_date': '2013-06-01',
 'end_date': '2013-09-01',
 'individualResults': True,
@@ -31,7 +34,12 @@
 },
 }]
 jr = RunReport(desired_responses, user_id=self.test_user_id)
-results = jr.task.delay(jr).get()[0]
+results = jr.task.delay(jr).get()
+result_key = self.session.query(PersistentReport)\
+.filter(PersistentReport.id == jr.children[0].persistent_id)\
+.one()\
+.result_key
+results = results[result_key]
 # TODO: figure out why one of the resulting wiki_user_ids is None here
 assert_equals(
 results[Aggregation.IND][0][self.test_mediawiki_user_id]['edits'],
@@ -46,7 +54,7 @@
 },
 'metric': {
 'name': 'NamespaceEdits',
-'namespaces': [0,1,2],
+'namespaces': [0, 1, 2],
 'start_date': '2013-06-01',
 'end_date': '2013-09-01',
 'individualResults': True,
@@ -57,7 +65,12 @@
 },
 }]
 jr = RunReport(desired_responses, user_id=self.test_user_id)
-results = jr.task.delay(jr).get()[0]
+results = jr.task.delay(jr).get()
+result_key = self.session.query(PersistentReport)\
+.filter(PersistentReport.id == jr.children[0].persistent_id)\
+.one()\
+.result_key
+results = results[result_key]
 assert_equals(
 results[Aggregation.IND][0][self.test_mediawiki_user_id]['edits'],
 2,
@@ -76,7 +89,7 @@
 },
 'metric': {
 'name': 'BytesAdded',
-'namespaces': [0,1,2],
+'namespaces': [0, 1, 2],
 'start_date': '2013-06-01',
 'end_date': '2013-09-01',
 'individualResults': True,
@@ -87,8 +100,12 @@
 },
 }]
 jr = RunReport(desired_responses, user_id=self.test_user_id)
-result