Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
swh-core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Platform
Development
swh-core
Commits
4e0d4fa1
Commit
4e0d4fa1
authored
5 months ago
by
David Douard
Browse files
Options
Downloads
Patches
Plain Diff
test/db/test_cli: use raw yaml instead of dumping nested dicts
It is IMHO easier to read.
parent
fc2936da
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!395
Improve 'swh db' commands for easier usage in test environments and better consistency
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
swh/core/db/tests/test_cli.py
+65
-115
65 additions, 115 deletions
swh/core/db/tests/test_cli.py
with
65 additions
and
115 deletions
swh/core/db/tests/test_cli.py
+
65
−
115
View file @
4e0d4fa1
...
...
@@ -436,29 +436,19 @@ def test_cli_swh_db_initadmin_and_init_db_from_config_path(
# This initializes the schema and data
cfgfile
=
tmp_path
/
"
config.yml
"
cfgfile
.
write_text
(
yaml
.
dump
(
{
"
test
"
:
{
"
cls
"
:
"
something
"
,
"
backend
"
:
{
"
cls
"
:
"
pipeline
"
,
"
steps
"
:
[
{
"
cls
"
:
"
cli
"
,
"
db
"
:
conninfo
,
},
{
"
cls
"
:
"
cli
"
,
"
backend
"
:
{
"
cls
"
:
"
cli2
"
,
"
cli_db
"
:
conninfo2
,
},
},
],
},
}
}
)
f
"""
test:
cls: something
backend:
cls: pipeline
steps:
- cls: cli
db:
{
conninfo
}
- cls: cli
backend:
cls: cli2
cli_db:
{
conninfo2
}
"""
)
if
initialize_all
:
result
=
cli_runner
.
invoke
(
swhdb
,
[
"
-C
"
,
cfgfile
,
"
init-admin
"
,
"
-a
"
,
"
test
"
])
...
...
@@ -506,29 +496,19 @@ def test_cli_swh_db_list_config_path(
cfgfile
=
tmp_path
/
"
config.yml
"
cfgfile
.
write_text
(
yaml
.
dump
(
{
"
test
"
:
{
"
cls
"
:
"
something
"
,
"
backend
"
:
{
"
cls
"
:
"
pipeline
"
,
"
steps
"
:
[
{
"
cls
"
:
"
cli
"
,
"
db
"
:
conninfo
,
},
{
"
cls
"
:
"
cli
"
,
"
backend
"
:
{
"
cls
"
:
"
cli2
"
,
"
cli_db
"
:
conninfo2
,
},
},
],
},
}
}
)
f
"""
test:
cls: something
backend:
cls: pipeline
steps:
- cls: cli
db:
{
conninfo
}
- cls: cli
backend:
cls: cli2
cli_db:
{
conninfo2
}
"""
)
result
=
cli_runner
.
invoke
(
swhdb
,
[
"
-C
"
,
cfgfile
,
"
list
"
])
assert_result
(
result
)
...
...
@@ -556,29 +536,19 @@ def test_cli_swh_db_version_from_config(
cfgfile
=
tmp_path
/
"
config.yml
"
cfgfile
.
write_text
(
yaml
.
dump
(
{
"
test
"
:
{
"
cls
"
:
"
something
"
,
"
backend
"
:
{
"
cls
"
:
"
pipeline
"
,
"
steps
"
:
[
{
"
cls
"
:
"
cli
"
,
"
db
"
:
conninfo
,
},
{
"
cls
"
:
"
cli
"
,
"
backend
"
:
{
"
cls
"
:
"
cli2
"
,
"
cli_db
"
:
conninfo2
,
},
},
],
},
}
}
)
f
"""
test:
cls: something
backend:
cls: pipeline
steps:
- cls: cli
db:
{
conninfo
}
- cls: cli
backend:
cls: cli2
cli_db:
{
conninfo2
}
"""
)
result
=
cli_runner
.
invoke
(
swhdb
,
[
"
-C
"
,
cfgfile
,
"
init-admin
"
,
"
-a
"
,
"
test
"
])
assert_result
(
result
)
...
...
@@ -654,29 +624,19 @@ def test_cli_swh_db_upgrade_from_config(
cfgfile
=
tmp_path
/
"
config.yml
"
cfgfile
.
write_text
(
yaml
.
dump
(
{
"
test
"
:
{
"
cls
"
:
"
something
"
,
"
backend
"
:
{
"
cls
"
:
"
pipeline
"
,
"
steps
"
:
[
{
"
cls
"
:
"
cli
"
,
"
db
"
:
conninfo
,
},
{
"
cls
"
:
"
cli
"
,
"
backend
"
:
{
"
cls
"
:
"
cli2
"
,
"
cli_db
"
:
conninfo2
,
},
},
],
},
}
}
)
f
"""
test:
cls: something
backend:
cls: pipeline
steps:
- cls: cli
db:
{
conninfo
}
- cls: cli
backend:
cls: cli2
cli_db:
{
conninfo2
}
"""
)
module_name
=
"
test
"
...
...
@@ -789,29 +749,19 @@ def test_cli_swh_db_upgrade_all(
cfgfile
=
tmp_path
/
"
config.yml
"
cfgfile
.
write_text
(
yaml
.
dump
(
{
"
test
"
:
{
"
cls
"
:
"
something
"
,
"
backend
"
:
{
"
cls
"
:
"
pipeline
"
,
"
steps
"
:
[
{
"
cls
"
:
"
cli
"
,
"
db
"
:
conninfo
,
},
{
"
cls
"
:
"
cli
"
,
"
backend
"
:
{
"
cls
"
:
"
cli2
"
,
"
cli_db
"
:
conninfo2
,
},
},
],
},
}
}
)
f
"""
test:
cls: something
backend:
cls: pipeline
steps:
- cls: cli
db:
{
conninfo
}
- cls: cli
backend:
cls: cli2
cli_db:
{
conninfo2
}
"""
)
module_name
=
"
test
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment