engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: fixed few possible cases of detached instance errors.

Browse source
This commit is contained in:
Marcin Kuzminski 2017-07-12 16:32:06 +02:00
parent f1c0268398
commit 93de470b3f
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rhodecode/apps/repository/tests/test_vcs_settings.py
View file

@ -22,6 +22,7 @@ import mock
import pytest
import rhodecode
from rhodecode.model.db import Repository
from rhodecode.model.settings import SettingsModel
from rhodecode.tests import url
from rhodecode.tests.utils import AssertResponse
@ -87,10 +88,11 @@ class TestAdminRepoVcsSettings(object):
pytest.skip('Setting not available for backend {}'.format(backend))
repo = backend.create_repo()
repo_name = repo.repo_name
settings_model = SettingsModel(repo=repo)
vcs_settings_url = url(
'repo_vcs_settings', repo_name=repo.repo_name)
'repo_vcs_settings', repo_name=repo_name)
self.app.post(
vcs_settings_url,
@ -101,6 +103,7 @@ class TestAdminRepoVcsSettings(object):
'rhodecode_{}'.format(setting_name): 'true',
'csrf_token': csrf_token,
})
settings_model = SettingsModel(repo=Repository.get_by_repo_name(repo_name))
setting = settings_model.get_setting_by_name(setting_name)
assert setting.app_settings_value
@ -113,5 +116,6 @@ class TestAdminRepoVcsSettings(object):
'rhodecode_{}'.format(setting_name): 'false',
'csrf_token': csrf_token,
})
settings_model = SettingsModel(repo=Repository.get_by_repo_name(repo_name))
setting = settings_model.get_setting_by_name(setting_name)
assert not setting.app_settings_value

5
rhodecode/tests/functional/test_admin_repos_issuetracker.py
View file

@ -21,6 +21,7 @@
import pytest
from rhodecode.lib.utils2 import md5
from rhodecode.model.db import Repository
from rhodecode.model.meta import Session
from rhodecode.model.settings import SettingsModel, IssueTrackerSettingsModel
from rhodecode.tests import url
@ -100,6 +101,7 @@ class TestAdminRepos:
def test_delete_issuetracker_pattern(
self, autologin_user, backend, csrf_token, settings_util):
repo = backend.create_repo()
repo_name = repo.repo_name
entry_key = 'issuetracker_pat_'
pattern = 'issuetracker_pat3'
uid = md5(pattern)
@ -115,5 +117,6 @@ class TestAdminRepos:
'uid': uid,
'csrf_token': csrf_token
}, status=302)
settings = IssueTrackerSettingsModel(repo=repo).get_repo_settings()
settings = IssueTrackerSettingsModel(
repo=Repository.get_by_repo_name(repo_name)).get_repo_settings()
assert 'rhodecode_%s%s' % (entry_key, uid) not in settings