haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-17 14:37:58 +00:00
Code Issues Releases Wiki Activity

fixed tests

Browse Source
This commit is contained in:
lins05 2014-11-21 10:31:09 +08:00
parent 1a66d59841
commit 4983c52f28
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test-requirements.txt
View File

@ -1,3 +1,3 @@
selenium==2.42.1 selenium==2.42.1
requests==2.3.0 requests==2.3.0
nose pytest

10
tests/api/test_files.py
View File

@ -113,13 +113,13 @@ class FilesApiTest(ApiTestBase):
with self.get_tmp_repo() as repo: with self.get_tmp_repo() as repo:
upload_url = urljoin(repo.repo_url, 'upload-link') upload_url = urljoin(repo.repo_url, 'upload-link')
res = self.get(upload_url) res = self.get(upload_url)
self.assertRegexpMatches(res.text, r'"http(.*)/upload-api/\w{8,8}"') self.assertRegexpMatches(res.text, r'"http(.*)/upload-api/[^/]+"')
def test_get_update_link(self): def test_get_update_link(self):
with self.get_tmp_repo() as repo: with self.get_tmp_repo() as repo:
update_url = urljoin(repo.repo_url, 'update-link') update_url = urljoin(repo.repo_url, 'update-link')
res = self.get(update_url) res = self.get(update_url)
self.assertRegexpMatches(res.text, r'"http(.*)/update-api/\w{8,8}"') self.assertRegexpMatches(res.text, r'"http(.*)/update-api/[^/]+"')
# def test_upload_file(self): # def test_upload_file(self):
# # XXX: requests has problems when post a file whose name contains # # XXX: requests has problems when post a file whose name contains
@ -154,13 +154,13 @@ class FilesApiTest(ApiTestBase):
with self.get_tmp_repo() as repo: with self.get_tmp_repo() as repo:
upload_blks_url = urljoin(repo.repo_url, 'upload-blks-link') upload_blks_url = urljoin(repo.repo_url, 'upload-blks-link')
res = self.get(upload_blks_url) res = self.get(upload_blks_url)
self.assertRegexpMatches(res.text, r'"http(.*)/upload-blks-api/\w{8,8}"') self.assertRegexpMatches(res.text, r'"http(.*)/upload-blks-api/[^/]+"')
def test_get_update_blocks_link(self): def test_get_update_blocks_link(self):
with self.get_tmp_repo() as repo: with self.get_tmp_repo() as repo:
update_blks_url = urljoin(repo.repo_url, 'update-blks-link') update_blks_url = urljoin(repo.repo_url, 'update-blks-link')
res = self.get(update_blks_url) res = self.get(update_blks_url)
self.assertRegexpMatches(res.text, r'"http(.*)/update-blks-api/\w{8,8}"') self.assertRegexpMatches(res.text, r'"http(.*)/update-blks-api/[^/]+"')
def test_list_dir(self): def test_list_dir(self):
with self.get_tmp_repo() as repo: with self.get_tmp_repo() as repo:
@ -189,7 +189,7 @@ class FilesApiTest(ApiTestBase):
ddurl = urljoin(repo.dir_url, 'download') + query ddurl = urljoin(repo.dir_url, 'download') + query
res = self.get(ddurl) res = self.get(ddurl)
self.assertRegexpMatches(res.text, self.assertRegexpMatches(res.text,
r'"http(.*)/files/\w{8,8}/%s"' % quote(dpath[1:])) r'"http(.*)/files/[^/]+/%s"' % quote(dpath[1:]))
def test_share_dir(self): def test_share_dir(self):
with self.get_tmp_repo() as repo: with self.get_tmp_repo() as repo:

2
tests/seahubtests.sh
View File

@ -54,7 +54,7 @@ function start_seahub() {
function run_tests() { function run_tests() {
set +e set +e
cd tests cd tests
nosetests $nose_opts py.test $nose_opts
rvalue=$? rvalue=$?
cd - cd -
if [[ ${TRAVIS} != "" ]]; then if [[ ${TRAVIS} != "" ]]; then