summaryrefslogtreecommitdiff
path: root/tests/data/merge_sources
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2020-06-08 17:08:43 -0400
committerGitHub <noreply@github.com>2020-06-08 17:08:43 -0400
commit87b8080f3163574580a207f15ff308da6010b0ff (patch)
tree6e9aa0a6f86a95d085ace5297dc980893176cc4a /tests/data/merge_sources
parent4e534a7c22514d162e65cc773d44b706fe877cea (diff)
downloadvyos-cloud-init-87b8080f3163574580a207f15ff308da6010b0ff.tar.gz
vyos-cloud-init-87b8080f3163574580a207f15ff308da6010b0ff.zip
test: move conftest.py to top-level, to cover tests/ also (#414)
* test_opennebula: convert TestParseShellConfig to a pytest test And allow it to run bash. (We aren't aiming to convert TestCase tests to pytest tests as a rule. In this case, I needed to change its implementation to limit subp usage, and I chose pytest over CiTestCase.) * test: move conftest.py to top-level, to cover tests/ also This gives us a single conftest.py which is shared by all tests in the project.
Diffstat (limited to 'tests/data/merge_sources')
0 files changed, 0 insertions, 0 deletions