diff --git a/.coveragerc b/.coveragerc index c47ac35..0309517 100644 --- a/.coveragerc +++ b/.coveragerc @@ -9,3 +9,4 @@ omit = *apps* *commands* *oauth* + *travis_test* diff --git a/blog/tests.py b/blog/tests.py index d1a1920..ad255a2 100644 --- a/blog/tests.py +++ b/blog/tests.py @@ -2,6 +2,9 @@ from django.test import Client, RequestFactory, TestCase from blog.models import Article, Category, Tag from django.contrib.auth import get_user_model from django.contrib.sites.models import Site +from blog.forms import BlogSearchForm +from django.core.paginator import Paginator +from blog.templatetags.blog_tags import load_pagination_info, load_articletags import datetime from accounts.models import BlogUser @@ -54,6 +57,29 @@ class ArticleTest(TestCase): response = self.client.get(category.get_absolute_url()) self.assertEqual(response.status_code, 200) + response = self.client.get('/search', {'q': 'django'}) + self.assertEqual(response.status_code, 200) + s = load_articletags(article) + self.assertIsNotNone(s) + + p = Paginator(Article.objects.all(), 2) + s = load_pagination_info(p.page(1), '', '') + self.assertIsNotNone(s) + + p = Paginator(Tag.objects.all(), 2) + s = load_pagination_info(p.page(1), '分类标签归档', 'tagname') + self.assertIsNotNone(s) + + p = Paginator(BlogUser.objects.all(), 2) + s = load_pagination_info(p.page(1), '作者文章归档', 'username') + self.assertIsNotNone(s) + + p = Paginator(Category.objects.all(), 2) + s = load_pagination_info(p.page(1), '分类目录归档', 'categoryname') + self.assertIsNotNone(s) + + f = BlogSearchForm() + f.search() from DjangoBlog.spider_notify import SpiderNotify SpiderNotify.baidu_notify([article.get_full_url()]) diff --git a/requirements.txt b/requirements.txt index 5c0ac66..4dbb299 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ appdirs==1.4.3 -Django==1.11.4 +Django==1.11.5 django-appconf==1.0.2 django-autoslug==1.9.3 django-compressor==2.2 diff --git a/servermanager/Api/commonapi.py b/servermanager/Api/commonapi.py index 560352b..369f804 100644 --- a/servermanager/Api/commonapi.py +++ b/servermanager/Api/commonapi.py @@ -39,6 +39,5 @@ class TuLing(): if str(jsons["code"]) == '100000': return jsons["text"] except Exception as e: - print(e) logger.warn(e) return "哎呀,出错啦。" diff --git a/servermanager/admin.py b/servermanager/admin.py index 7adf020..bb7d87e 100644 --- a/servermanager/admin.py +++ b/servermanager/admin.py @@ -5,7 +5,7 @@ from .models import commands class CommandsAdmin(admin.ModelAdmin): - pass + list_display = ('title', 'command', 'describe') admin.site.register(commands, CommandsAdmin) diff --git a/travis_test/requirements.txt b/travis_test/requirements.txt index c0fa0cb..bf78591 100644 --- a/travis_test/requirements.txt +++ b/travis_test/requirements.txt @@ -1,5 +1,5 @@ appdirs==1.4.3 -Django==1.11.4 +Django==1.11.5 django-appconf==1.0.2 django-autoslug==1.9.3 django-compressor==2.2