Milimetric has uploaded a new change for review. https://gerrit.wikimedia.org/r/129024
Change subject: Remove unnecessary method and test ...................................................................... Remove unnecessary method and test Change-Id: I0d212920ffee484ee0eabab7e72798fa1079b7eb --- M tests/test_controllers/test_demo.py M wikimetrics/controllers/demo.py 2 files changed, 0 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics refs/changes/24/129024/1 diff --git a/tests/test_controllers/test_demo.py b/tests/test_controllers/test_demo.py index e4be8d4..3d78622 100644 --- a/tests/test_controllers/test_demo.py +++ b/tests/test_controllers/test_demo.py @@ -5,19 +5,6 @@ class TestDemoController(WebTest): - def test_run_task_in_celery(self): - response = self.app.get('/demo/metric/random/1') - assert_equal( - response.status_code, 200, - '/demo/metric/random/<cohort-id>/ exists and is OK to GET' - ) - - response = self.app.get('/demo/metric/random/2') - assert_equal( - response.status_code, 200, - '/demo/metric/random/<cohort-without-users> works' - ) - def test_delete_cohorts(self): response = self.app.get('/demo/delete/cohorts/') assert_equal(response.status_code, 200) diff --git a/wikimetrics/controllers/demo.py b/wikimetrics/controllers/demo.py index 95b2b00..5b52a2a 100644 --- a/wikimetrics/controllers/demo.py +++ b/wikimetrics/controllers/demo.py @@ -54,26 +54,6 @@ db_sess.commit() return user - @app.route('/demo/metric/random/<int:cohort_id>') - def run_task_in_celery(cohort_id): - db_session = db.get_session() - try: - user_ids = db_session.query(WikiUser.mediawiki_userid)\ - .join(CohortWikiUser)\ - .filter(CohortWikiUser.cohort_id == cohort_id)\ - .all() - if len(user_ids) == 0: - user_ids = db_session.query(WikiUser.mediawiki_userid).all() - finally: - db_session.close() - # note that this code runs only in development - # TODO, what about working with more than one project in development? - # need to translate from project to dbName - report = MetricReport(RandomMetric(), user_ids, 'wiki') - #from nose.tools import set_trace; set_trace() - res = report.task.delay(report).get() - return str(res) - @app.route('/demo/delete/cohorts/') def demo_delete_cohorts(): db_sess = db.get_session() -- To view, visit https://gerrit.wikimedia.org/r/129024 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d212920ffee484ee0eabab7e72798fa1079b7eb Gerrit-PatchSet: 1 Gerrit-Project: analytics/wikimetrics Gerrit-Branch: master Gerrit-Owner: Milimetric <dandree...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits