Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sbws
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
juga
sbws
Commits
835e98d9
Unverified
Commit
835e98d9
authored
6 years ago
by
juga
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #258 from juga0/ticket27342_test_args
Ticket27342 test args
parents
b6c480eb
1447b227
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
tests/integration/conftest.py
+9
-2
9 additions, 2 deletions
tests/integration/conftest.py
with
10 additions
and
2 deletions
CHANGELOG.md
+
1
−
0
View file @
835e98d9
...
...
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
-
Broken environment variable in default sbws config. To use envvar $FOO, write
$$FOO in the config.
-
Stop using directory as argument in integration tests (#27342)
### Changed
...
...
This diff is collapsed.
Click to expand it.
tests/integration/conftest.py
+
9
−
2
View file @
835e98d9
...
...
@@ -50,9 +50,16 @@ def sbwshome_dir(sbwshome_empty):
@pytest.fixture
(
scope
=
'
session
'
)
def
args
(
sbwshome_dir
,
parser
):
def
test_config_path
(
tmpdir
):
""""""
config
=
tmpdir
.
join
(
'
.sbws.ini
'
)
return
config
@pytest.fixture
(
scope
=
'
session
'
)
def
args
(
sbwshome_empty
,
parser
,
test_config_path
):
"""
Args with sbws home in the tests tmp dir.
"""
args
=
_PseudoArguments
(
directory
=
sbwshome_dir
,
output
=
sbwshome_
dir
,
args
=
_PseudoArguments
(
config
=
test_config_path
,
output
=
sbwshome_
empty
,
scale
=
False
,
log_level
=
'
debug
'
)
return
args
...
...
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