From 892e03da52a9fb07946a94c5bbef8b0280712230 Mon Sep 17 00:00:00 2001 From: liangliangyy Date: Thu, 2 Mar 2023 17:51:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=83=A8=E5=88=86=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blog/tests.py | 11 ++++++++++- owntracks/tests.py | 8 ++++---- owntracks/views.py | 3 ++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/blog/tests.py b/blog/tests.py index 84c9c1d..dfe63c1 100644 --- a/blog/tests.py +++ b/blog/tests.py @@ -143,7 +143,8 @@ class ArticleTest(TestCase): self.client.get("/admin/blog/article/1/delete/") self.client.get('/admin/servermanager/emailsendlog/') - self.client.get('admin/admin/logentry/') + self.client.get('/admin/admin/logentry/') + self.client.get('/admin/admin/logentry/1/change/') def __check_pagination__(self, p, type, value): s = load_pagination_info(p.page(1), type, value) @@ -188,6 +189,14 @@ class ArticleTest(TestCase): self.assertEqual(rsp.status_code, 404) def test_commands(self): + user = BlogUser.objects.get_or_create( + email="liangliangyy@gmail.com", + username="liangliangyy")[0] + user.set_password("liangliangyy") + user.is_staff = True + user.is_superuser = True + user.save() + from blog.documents import ELASTICSEARCH_ENABLED if ELASTICSEARCH_ENABLED: call_command("build_index") diff --git a/owntracks/tests.py b/owntracks/tests.py index 1ad14fc..3b4b9d8 100644 --- a/owntracks/tests.py +++ b/owntracks/tests.py @@ -58,7 +58,7 @@ class OwnTrackLogTest(TestCase): self.assertEqual(rsp.status_code, 200) rsp = self.client.get('/owntracks/show_maps') self.assertEqual(rsp.status_code, 200) - # rsp = self.client.get('/owntracks/get_datas') - # self.assertEqual(rsp.status_code, 200) - # rsp = self.client.get('/owntracks/get_datas?date=2018-02-26') - # self.assertEqual(rsp.status_code, 200) + rsp = self.client.get('/owntracks/get_datas') + self.assertEqual(rsp.status_code, 200) + rsp = self.client.get('/owntracks/get_datas?date=2018-02-26') + self.assertEqual(rsp.status_code, 200) diff --git a/owntracks/views.py b/owntracks/views.py index 1396b95..27a89c8 100644 --- a/owntracks/views.py +++ b/owntracks/views.py @@ -86,7 +86,8 @@ def convert_to_amap(locations): } rsp = requests.get(url=api, params=query) result = json.loads(rsp.text) - convert_result.append(result['locations']) + if "locations" in result: + convert_result.append(result['locations']) item = list(itertools.islice(it, 30)) return ";".join(convert_result)