Skip to content

Commit

Permalink
hardened preparing context for schema
Browse files Browse the repository at this point in the history
  • Loading branch information
@godfryd
godfryd committed Aug 27, 2023
1 parent 312f3ae commit 771d29c
Show file tree
Hide file tree
Showing 3 changed files with 207 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Rakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ task :server_ut do

ENV['POSTGRES_URL'] = "postgresql://kkut:kkut@localhost:15432/"
Dir.chdir('server') do
sh 'rm .coverage'
sh 'rm -f .coverage'
sh "../venv/bin/poetry run pytest --ignore=./tests/example_tool --cov-branch --cov=. -s -r A -vv #{ENV['test']}"
sh 'rm -rf htmlcov'
sh '../venv/bin/poetry run coverage html -i --omit=./tests/*'
Expand Down
22 changes: 19 additions & 3 deletions server/kraken/server/schema.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,8 @@ def prepare_context(entity, args):

if stage:
ctx['stage'] = stage.get_json(with_schema=False)
else:
ctx['stage'] = None

if run:
ctx['flow'] = run.flow.get_json(with_project=False, with_branch=False, with_schema=False, with_user_data=True,
Expand All @@ -309,7 +311,14 @@ def prepare_context(entity, args):
ctx['is_ci'] = run.flow.kind == consts.FLOW_KIND_CI
ctx['is_dev'] = run.flow.kind == consts.FLOW_KIND_DEV
ctx['run_label'] = run.label
ctx['flow_label'] = run.flow.label
ctx['flow_label'] = run.flow.get_label()
else:
ctx['flow'] = None
ctx['run'] = None
ctx['is_ci'] = True
ctx['is_dev'] = False
ctx['run_label'] = None
ctx['flow_label'] = None

if step:
ctx['job'] = step.job.get_json()
Expand All @@ -332,10 +341,17 @@ def prepare_context(entity, args):
break

ctx['prev_ok'] = prev_ok
ctx['always'] = True
ctx['never'] = False
ctx['was_any_error'] = was_any_error
ctx['was_no_error'] = was_no_error
else:
ctx['job'] = None
ctx['step'] = None
ctx['prev_ok'] = True
ctx['was_any_error'] = False
ctx['was_no_error'] = True

ctx['always'] = True
ctx['never'] = False

return ctx

Expand Down
187 changes: 187 additions & 0 deletions server/tests/test_schema.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

import pytest
from hamcrest import assert_that, has_entries, contains

import jinja2

Expand Down Expand Up @@ -232,3 +233,189 @@ def test_substitute_val():
val = 'aaa #{run.label} ccc'
new_val, new_val_masked = schema.substitute_val(val, args, ctx)
assert new_val == 'aaa 333. ccc'


@pytest.mark.db
def test_prepare_context():
app = create_app()

with app.app_context():
initdb._prepare_initial_preferences()

proj = Project(name='proj-1', user_data={'aaa': 321})
branch = Branch(name='br', project=proj, user_data={'aaa': 234}, user_data_ci={'aaa': {'bbb': 234}}, user_data_dev={'aaa': 456})
stage = Stage(branch=branch, schema={})
flow = Flow(branch=branch, kind=consts.FLOW_KIND_CI, user_data={'aaa': 123})
run = Run(stage=stage, flow=flow, reason={'reason': 'by me'}, label='333.')
system = System()
agents_group = AgentsGroup()
job = Job(run=run, agents_group=agents_group, system=system, name='hello')
tool = Tool(fields={})
step = Step(index=0,
job=job,
tool=tool,
fields={},
fields_raw={})
db.session.commit()

args = {'a': 'b'}

built_ins = {
'args': args,
'project': has_entries({
'id': proj.id,
'name': 'proj-1',
'data': {
'aaa': 321,
},
}),
'branch': has_entries({
'id': branch.id,
'name': 'br',
'project_id': proj.id,
'project_name': 'proj-1',
'branch_name': None,
'data': {
'aaa': 234
},
'data_ci': {
'aaa': {'bbb': 234}
},
'data_dev': {
'aaa': 456
}
}),
'branch_name': 'br',
'env': {},
'secrets': {},
'stage': has_entries({
'id': stage.id,
'name': None,
'description': None,
'enabled': True,
'schema_from_repo_enabled': False,
'repo_url': None,
'repo_branch': None,
'repo_access_token': None,
'repo_state': 0,
'repo_error': None,
'repo_refresh_interval': None,
'git_clone_params': None,
'repo_version': None,
'schema_file': None
}),
'flow': has_entries({
'id': flow.id,
'label': '%d.' % flow.id,
'state': 'in-progress',
'kind': 'ci',
'duration': '0s',
'branch_name': None,
'args': {},
'trigger': None,
'data': {'aaa': 123}
}),
'run': has_entries({
'id': run.id,
'label': '333.',
'started': None,
'finished': None,
'processed_at': None,
'duration': '',
'state': 'in-progress',
'stage_name': None,
'stage_id': stage.id,
'flow_id': flow.id,
'flow_kind': 'ci',
'flow_label': '%d.' % flow.id,
'args': {},
'jobs_total': 0,
'jobs_waiting': 0,
'jobs_executing': 0,
'jobs_processing': 0,
'jobs_error': 0,
'tests_total': 0,
'tests_passed': 0,
'tests_not_run': 0,
'issues_total': 0,
'issues_new': 0,
'new_cnt': 0,
'no_change_cnt': 0,
'regr_cnt': 0,
'fix_cnt': 0,
'reason': 'by me'
}),
'is_ci': True,
'is_dev': False,
'run_label': '333.',
'flow_label': '%d.' % flow.id,
'job': has_entries({
'id': job.id,
'started': None,
'finished': None,
'completed': None,
'duration': '',
'name': 'hello',
'state': 2,
'completion_status': None,
'timeout': None,
'covered': False,
'notes': None,
'system_id': system.id,
'system': None,
'executor': None,
'run_id': run.id,
'agents_group_id': agents_group.id,
'agents_group_name': None,
'agent_id': 0,
'agent_name': '',
'steps': contains(has_entries({
'id': step.id,
'index': 0,
'tool': None,
'tool_id': tool.id,
'tool_location': None,
'tool_entry': None,
'tool_version': None,
'job_id': job.id,
'status': None,
'result': None,
}))
}),
'step': has_entries({
'id': step.id,
'index': 0,
'tool': None,
'tool_id': tool.id,
'tool_location': None,
'tool_entry': None,
'tool_version': None,
'job_id': job.id,
'status': None,
'result': None,
}),
'prev_ok': True,
'always': True,
'never': False,
'was_any_error': False,
'was_no_error': True,
}

ctx = schema.prepare_context(step, args)
assert_that(ctx, has_entries(built_ins))

built_ins['job'] = None
built_ins['step'] = None
ctx = schema.prepare_context(run, args)
assert_that(ctx, has_entries(built_ins))

built_ins['run'] = None
built_ins['flow'] = None
built_ins['run_label'] = None
built_ins['flow_label'] = None
ctx = schema.prepare_context(stage, args)
assert_that(ctx, has_entries(built_ins))

built_ins['stage'] = None
ctx = schema.prepare_context(branch, args)
assert_that(ctx, has_entries(built_ins))

0 comments on commit 771d29c

Please sign in to comment.