diff --git a/tests/api/endpoints/admin/test_statistics.py b/tests/api/endpoints/admin/test_statistics.py index f70cae4689..804446f03b 100644 --- a/tests/api/endpoints/admin/test_statistics.py +++ b/tests/api/endpoints/admin/test_statistics.py @@ -15,17 +15,8 @@ class FileOperationsInfoText(BaseTestCase): @patch("seahub.api2.endpoints.admin.statistics.EVENTS_ENABLED") @patch("seahub.api2.endpoints.admin.statistics.is_pro_version") - @patch("seahub.api2.endpoints.admin.statistics.get_file_ops_stats") @patch("seahub.api2.endpoints.admin.statistics.get_file_ops_stats_by_day") - def test_can_get_file_audit_stats(self, mock_get_file_audit_stats_by_day, mock_get_file_audit_stats, - mock_is_pro, mock_events_enabled): - mock_get_file_audit_stats.return_value = [ - (datetime.datetime(2017, 6, 2, 7, 0), u'Added', 2L), - (datetime.datetime(2017, 6, 2, 7, 0), u'Deleted', 2L), - (datetime.datetime(2017, 6, 2, 7, 0), u'Visited', 2L), - (datetime.datetime(2017, 6, 2, 8, 0), u'Added', 3L), - (datetime.datetime(2017, 6, 2, 8, 0), u'Deleted', 4L), - (datetime.datetime(2017, 6, 2, 8, 0), u'Visited', 5L)] + def test_can_get_file_audit_stats(self, mock_get_file_audit_stats_by_day, mock_is_pro, mock_events_enabled): mock_get_file_audit_stats_by_day.return_value = [ (datetime.datetime(2017, 6, 2, 4, 2), u'Added', 2L), (datetime.datetime(2017, 6, 2, 4, 2), u'Deleted', 2L), @@ -34,17 +25,7 @@ class FileOperationsInfoText(BaseTestCase): mock_is_pro.return_value = True mock_events_enabled = True url = reverse('api-v2.1-admin-statistics-file-operations') - url += "?start=2017-06-01 07:00:00&end=2017-06-03 07:00:00&group_by=hour" - resp = self.client.get(url) - json_resp = json.loads(resp.content) - self.assertEqual(200, resp.status_code) - data = {'datetime': datetime_to_isoformat_timestr(datetime.datetime(2017, 6, 2, 7, 0)), - 'added': 2L, 'deleted': 2L, 'visited': 2L} - assert data in json_resp - data = {'datetime': datetime_to_isoformat_timestr(datetime.datetime(2017, 6, 2, 8, 0)), - 'added': 3L, 'deleted': 4L, 'visited': 5L} - assert data in json_resp - url += "?start=2017-06-01 07:00:00&end=2017-06-03 07:00:00&group_by=day" + url += "?start=2017-06-01 07:00:00&end=2017-06-03 07:00:00" resp = self.client.get(url) json_resp = json.loads(resp.content) self.assertEqual(200, resp.status_code)