Mercurial > kallithea
changeset 5753:1a7611b9730e
replace absolute /tmp paths to tempfile.gettempdir()
| author | domruf <dominikruf@gmail.com> |
|---|---|
| date | Tue, 02 Feb 2016 21:45:29 +0100 |
| parents | 8568a1d4f100 |
| children | d5e16407bdbb |
| files | kallithea/bin/kallithea_backup.py kallithea/tests/__init__.py kallithea/tests/functional/test_admin_settings.py kallithea/tests/other/manual_test_vcs_operations.py kallithea/tests/scripts/manual_test_crawler.py kallithea/tests/vcs/conf.py kallithea/tests/vcs/test_git.py kallithea/tests/vcs/test_hg.py |
| diffstat | 8 files changed, 45 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/bin/kallithea_backup.py Thu Jan 28 20:40:32 2016 +0100 +++ b/kallithea/bin/kallithea_backup.py Tue Feb 02 21:45:29 2016 +0100 @@ -28,11 +28,11 @@ import os import sys - import logging import tarfile import datetime import subprocess +import tempfile logging.basicConfig(level=logging.DEBUG, format="%(asctime)s %(levelname)-5.5s %(message)s") @@ -47,7 +47,7 @@ self.repos_path = self.get_repos_path(repos_location) self.backup_server = backup_server - self.backup_file_path = '/tmp' + self.backup_file_path = tempfile.gettempdir() logging.info('starting backup for %s', self.repos_path) logging.info('backup target %s', self.backup_file_path)
--- a/kallithea/tests/__init__.py Thu Jan 28 20:40:32 2016 +0100 +++ b/kallithea/tests/__init__.py Tue Feb 02 21:45:29 2016 +0100 @@ -80,7 +80,7 @@ #SOME GLOBALS FOR TESTS -TESTS_TMP_PATH = jn('/', 'tmp', 'rc_test_%s' % _RandomNameSequence().next()) +TESTS_TMP_PATH = jn(tempfile.gettempdir(), 'rc_test_%s' % _RandomNameSequence().next()) TEST_USER_ADMIN_LOGIN = 'test_admin' TEST_USER_ADMIN_PASS = 'test12' TEST_USER_ADMIN_EMAIL = 'test_admin@example.com'
--- a/kallithea/tests/functional/test_admin_settings.py Thu Jan 28 20:40:32 2016 +0100 +++ b/kallithea/tests/functional/test_admin_settings.py Tue Feb 02 21:45:29 2016 +0100 @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- +import tempfile + from kallithea.model.db import Setting, Ui from kallithea.tests import * from kallithea.tests.fixture import Fixture @@ -37,23 +39,23 @@ self.log_user() response = self.app.post(url('admin_settings_hooks'), params=dict(new_hook_ui_key='test_hooks_1', - new_hook_ui_value='cd /tmp', + new_hook_ui_value='cd %s' % tempfile.gettempdir(), _authentication_token=self.authentication_token())) response = response.follow() response.mustcontain('test_hooks_1') - response.mustcontain('cd /tmp') + response.mustcontain('cd %s' % tempfile.gettempdir()) def test_create_custom_hook_delete(self): self.log_user() response = self.app.post(url('admin_settings_hooks'), params=dict(new_hook_ui_key='test_hooks_2', - new_hook_ui_value='cd /tmp2', + new_hook_ui_value='cd %s2' % tempfile.gettempdir(), _authentication_token=self.authentication_token())) response = response.follow() response.mustcontain('test_hooks_2') - response.mustcontain('cd /tmp2') + response.mustcontain('cd %s2' % tempfile.gettempdir()) hook_id = Ui.get_by_key('hooks', 'test_hooks_2').ui_id ## delete @@ -61,7 +63,7 @@ params=dict(hook_id=hook_id, _authentication_token=self.authentication_token())) response = self.app.get(url('admin_settings_hooks')) response.mustcontain(no=['test_hooks_2']) - response.mustcontain(no=['cd /tmp2']) + response.mustcontain(no=['cd %s2' % tempfile.gettempdir()]) def test_index_search(self): self.log_user()
--- a/kallithea/tests/other/manual_test_vcs_operations.py Thu Jan 28 20:40:32 2016 +0100 +++ b/kallithea/tests/other/manual_test_vcs_operations.py Tue Feb 02 21:45:29 2016 +0100 @@ -188,7 +188,7 @@ def test_clone_hg_repo_by_admin(self): clone_url = _construct_url(HG_REPO) - stdout, stderr = Command('/tmp').execute('hg clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url) assert 'requesting all changes' in stdout assert 'adding changesets' in stdout @@ -199,45 +199,45 @@ def test_clone_git_repo_by_admin(self): clone_url = _construct_url(GIT_REPO) - stdout, stderr = Command('/tmp').execute('git clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url) assert 'Cloning into' in stdout + stderr assert stderr == '' or stdout == '' def test_clone_wrong_credentials_hg(self): clone_url = _construct_url(HG_REPO, passwd='bad!') - stdout, stderr = Command('/tmp').execute('hg clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url) assert 'abort: authorization failed' in stderr def test_clone_wrong_credentials_git(self): clone_url = _construct_url(GIT_REPO, passwd='bad!') - stdout, stderr = Command('/tmp').execute('git clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url) assert 'fatal: Authentication failed' in stderr def test_clone_git_dir_as_hg(self): clone_url = _construct_url(GIT_REPO) - stdout, stderr = Command('/tmp').execute('hg clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url) assert 'HTTP Error 404: Not Found' in stderr def test_clone_hg_repo_as_git(self): clone_url = _construct_url(HG_REPO) - stdout, stderr = Command('/tmp').execute('git clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url) assert 'not found' in stderr def test_clone_non_existing_path_hg(self): clone_url = _construct_url('trololo') - stdout, stderr = Command('/tmp').execute('hg clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url) assert 'HTTP Error 404: Not Found' in stderr def test_clone_non_existing_path_git(self): clone_url = _construct_url('trololo') - stdout, stderr = Command('/tmp').execute('git clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url) assert 'not found' in stderr def test_push_new_file_hg(self): DEST = _get_tmp_dir() clone_url = _construct_url(HG_REPO, dest=DEST) - stdout, stderr = Command('/tmp').execute('hg clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url) stdout, stderr = _add_files_and_push('hg', DEST) @@ -248,7 +248,7 @@ def test_push_new_file_git(self): DEST = _get_tmp_dir() clone_url = _construct_url(GIT_REPO, dest=DEST) - stdout, stderr = Command('/tmp').execute('git clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url) # commit some stuff into this repo stdout, stderr = _add_files_and_push('git', DEST) @@ -268,7 +268,7 @@ DEST = _get_tmp_dir() clone_url = _construct_url(HG_REPO, dest=DEST) - stdout, stderr = Command('/tmp').execute('hg clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url) stdout, stderr = _add_files_and_push('hg', DEST, files_no=1) @@ -288,7 +288,7 @@ DEST = _get_tmp_dir() clone_url = _construct_url(GIT_REPO, dest=DEST) - stdout, stderr = Command('/tmp').execute('git clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url) # commit some stuff into this repo stdout, stderr = _add_files_and_push('git', DEST, files_no=1) @@ -301,7 +301,7 @@ def test_push_wrong_credentials_hg(self): DEST = _get_tmp_dir() clone_url = _construct_url(HG_REPO, dest=DEST) - stdout, stderr = Command('/tmp').execute('hg clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url) stdout, stderr = _add_files_and_push('hg', DEST, user='bad', passwd='name') @@ -311,7 +311,7 @@ def test_push_wrong_credentials_git(self): DEST = _get_tmp_dir() clone_url = _construct_url(GIT_REPO, dest=DEST) - stdout, stderr = Command('/tmp').execute('git clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url) stdout, stderr = _add_files_and_push('git', DEST, user='bad', passwd='name') @@ -321,7 +321,7 @@ def test_push_back_to_wrong_url_hg(self): DEST = _get_tmp_dir() clone_url = _construct_url(HG_REPO, dest=DEST) - stdout, stderr = Command('/tmp').execute('hg clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url) stdout, stderr = _add_files_and_push('hg', DEST, clone_url='http://%s/tmp' % HOST) @@ -331,7 +331,7 @@ def test_push_back_to_wrong_url_git(self): DEST = _get_tmp_dir() clone_url = _construct_url(GIT_REPO, dest=DEST) - stdout, stderr = Command('/tmp').execute('git clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url) stdout, stderr = _add_files_and_push('git', DEST, clone_url='http://%s/tmp' % HOST) @@ -346,7 +346,7 @@ Session().commit() # clone clone_url = _construct_url(HG_REPO) - stdout, stderr = Command('/tmp').execute('hg clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url) #check if lock was made r = Repository.get_by_repo_name(HG_REPO) @@ -360,7 +360,7 @@ Session().commit() # clone clone_url = _construct_url(GIT_REPO) - stdout, stderr = Command('/tmp').execute('git clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url) #check if lock was made r = Repository.get_by_repo_name(GIT_REPO) @@ -372,7 +372,7 @@ Repository.lock(r, User.get_by_username(TEST_USER_ADMIN_LOGIN).user_id) #pull fails since repo is locked clone_url = _construct_url(HG_REPO) - stdout, stderr = Command('/tmp').execute('hg clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url) msg = ("""abort: HTTP Error 423: Repository `%s` locked by user `%s`""" % (HG_REPO, TEST_USER_ADMIN_LOGIN)) assert msg in stderr @@ -383,7 +383,7 @@ Repository.lock(r, User.get_by_username(TEST_USER_ADMIN_LOGIN).user_id) #pull fails since repo is locked clone_url = _construct_url(GIT_REPO) - stdout, stderr = Command('/tmp').execute('git clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url) msg = ("""The requested URL returned error: 423""") assert msg in stderr @@ -391,7 +391,7 @@ #clone some temp DEST = _get_tmp_dir() clone_url = _construct_url(HG_REPO, dest=DEST) - stdout, stderr = Command('/tmp').execute('hg clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url) #lock repo r = Repository.get_by_repo_name(HG_REPO) @@ -413,7 +413,7 @@ #clone some temp DEST = _get_tmp_dir() clone_url = _construct_url(GIT_REPO, dest=DEST) - stdout, stderr = Command('/tmp').execute('git clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url) #lock repo r = Repository.get_by_repo_name(GIT_REPO) @@ -447,7 +447,7 @@ #clone some temp DEST = _get_tmp_dir() clone_url = _construct_url(HG_REPO, dest=DEST) - stdout, stderr = Command('/tmp').execute('hg clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url) #check for lock repo after clone r = Repository.get_by_repo_name(HG_REPO) @@ -472,7 +472,7 @@ #clone some temp DEST = _get_tmp_dir() clone_url = _construct_url(GIT_REPO, dest=DEST) - stdout, stderr = Command('/tmp').execute('git clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url) #check for lock repo after clone r = Repository.get_by_repo_name(GIT_REPO) @@ -494,7 +494,7 @@ user_model.add_extra_ip(TEST_USER_ADMIN_LOGIN, '10.10.10.10/32') Session().commit() clone_url = _construct_url(HG_REPO) - stdout, stderr = Command('/tmp').execute('hg clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url) assert 'abort: HTTP Error 403: Forbidden' in stderr finally: #release IP restrictions @@ -504,7 +504,7 @@ time.sleep(2) clone_url = _construct_url(HG_REPO) - stdout, stderr = Command('/tmp').execute('hg clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url) assert 'requesting all changes' in stdout assert 'adding changesets' in stdout @@ -519,7 +519,7 @@ user_model.add_extra_ip(TEST_USER_ADMIN_LOGIN, '10.10.10.10/32') Session().commit() clone_url = _construct_url(GIT_REPO) - stdout, stderr = Command('/tmp').execute('git clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url) # The message apparently changed in Git 1.8.3, so match it loosely. assert re.search(r'\b403\b', stderr) finally: @@ -530,7 +530,7 @@ time.sleep(2) clone_url = _construct_url(GIT_REPO) - stdout, stderr = Command('/tmp').execute('git clone', clone_url) + stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url) assert 'Cloning into' in stdout + stderr assert stderr == '' or stdout == ''
--- a/kallithea/tests/scripts/manual_test_crawler.py Thu Jan 28 20:40:32 2016 +0100 +++ b/kallithea/tests/scripts/manual_test_crawler.py Tue Feb 02 21:45:29 2016 +0100 @@ -37,6 +37,7 @@ import time import os import sys +import tempfile from os.path import join as jn from os.path import dirname as dn @@ -69,7 +70,7 @@ ] -cj = cookielib.FileCookieJar('/tmp/rc_test_cookie.txt') +cj = cookielib.FileCookieJar(jn(tempfile.gettempdir(), 'rc_test_cookie.txt')) o = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj)) o.addheaders = [ ('User-agent', 'kallithea-crawler'),
--- a/kallithea/tests/vcs/conf.py Thu Jan 28 20:40:32 2016 +0100 +++ b/kallithea/tests/vcs/conf.py Tue Feb 02 21:45:29 2016 +0100 @@ -22,7 +22,7 @@ GIT_REMOTE_REPO = 'git://github.com/codeinn/vcs.git' -TEST_TMP_PATH = os.environ.get('VCS_TEST_ROOT', '/tmp') +TEST_TMP_PATH = os.environ.get('VCS_TEST_ROOT', tempfile.gettempdir()) TEST_GIT_REPO = os.environ.get('VCS_TEST_GIT_REPO', jn(TEST_TMP_PATH, 'vcs-git')) TEST_GIT_REPO_CLONE = os.environ.get('VCS_TEST_GIT_REPO_CLONE',
--- a/kallithea/tests/vcs/test_git.py Thu Jan 28 20:40:32 2016 +0100 +++ b/kallithea/tests/vcs/test_git.py Tue Feb 02 21:45:29 2016 +0100 @@ -4,6 +4,7 @@ import mock import datetime import urllib2 +import tempfile import pytest @@ -28,7 +29,7 @@ self.repo = GitRepository(TEST_GIT_REPO) def test_wrong_repo_path(self): - wrong_repo_path = '/tmp/errorrepo' + wrong_repo_path = os.path.join(tempfile.gettempdir(), 'errorrepo') self.assertRaises(RepositoryError, GitRepository, wrong_repo_path) def test_git_cmd_injection(self):
--- a/kallithea/tests/vcs/test_hg.py Thu Jan 28 20:40:32 2016 +0100 +++ b/kallithea/tests/vcs/test_hg.py Tue Feb 02 21:45:29 2016 +0100 @@ -3,6 +3,7 @@ import pytest +import tempfile from kallithea.lib.utils2 import safe_str from kallithea.lib.vcs.backends.hg import MercurialRepository, MercurialChangeset from kallithea.lib.vcs.exceptions import RepositoryError, VCSError, NodeDoesNotExistError @@ -31,7 +32,7 @@ self.repo = MercurialRepository(safe_str(TEST_HG_REPO)) def test_wrong_repo_path(self): - wrong_repo_path = '/tmp/errorrepo' + wrong_repo_path = os.path.join(tempfile.gettempdir(), 'errorrepo') self.assertRaises(RepositoryError, MercurialRepository, wrong_repo_path) def test_unicode_path_repo(self):