haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 15:09:14 +00:00
Code Issues Releases Wiki Activity

Merge branch '6.1'

Browse Source 
Conflicts:
	seahub/api2/views.py
This commit is contained in:
zhengxie
2017-06-30 14:27:07 +08:00
parent eb2719fc59 149a591528
commit bb8f04993d
27 changed files with 508 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/api/test_repos.py
View File

@@ -59,7 +59,6 @@ class ReposApiTest(ApiTestBase):
self.assertIsNotNone(rinfo['size'])
self.assertIsNotNone(rinfo['name'])
self.assertIsNotNone(rinfo['root'])
self.assertIsNotNone(rinfo['desc'])
self.assertIsNotNone(rinfo['type'])
assert len(rinfo['modifier_email']) > 0
assert len(rinfo['modifier_name']) > 0
@@ -84,7 +83,6 @@ class ReposApiTest(ApiTestBase):
#self.assertIsNotNone(commit['parent_id']) #allow null
self.assertIsNotNone(commit['new_merge'])
self.assertIsNotNone(commit['repo_id'])
self.assertIsNotNone(commit['desc'])
self.assertIsNotNone(commit['id'])
self.assertIsNotNone(commit['conflict'])
#self.assertIsNotNone(commit['second_parent_id']) #allow null