Merge ~adam-collard/maas-ci/+git/system-tests:generative-test-suites into ~maas-committers/maas-ci/+git/system-tests:master

Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 4176e0eef1209227a39e1f1ff522bf9e8f421577
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas-ci/+git/system-tests:generative-test-suites
Merge into: ~maas-committers/maas-ci/+git/system-tests:master
Diff against target: 48 lines (+6/-15)
1 file modified
tox.ini (+6/-15)
Reviewer Review Type Date Requested Status
Diego Mascialino (community) Approve
MAAS Lander Approve
Review via email: mp+417097@code.launchpad.net

Commit message

Use tox expansion to reduce DRY-violation

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b generative-test-suites lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 4176e0eef1209227a39e1f1ff522bf9e8f421577

review: Approve
Revision history for this message
Diego Mascialino (dmascialino) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/tox.ini b/tox.ini
index d1ba647..e340341 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
1[tox]1[tox]
2envlist = py3,lint,mypy,build,cog2envlist = cog,lint,mypy,build
33
4[testenv]4[testenv]
5passenv =5passenv =
@@ -11,20 +11,13 @@ passenv =
11 MAAS_SYSTEMTESTS_CLIENT_CONTAINER11 MAAS_SYSTEMTESTS_CLIENT_CONTAINER
12 MAAS_SYSTEMTESTS_LXD_PROFILE12 MAAS_SYSTEMTESTS_LXD_PROFILE
1313
14commands=
15 pytest systemtests/tests {posargs}
16
17[testenv:build]14[testenv:build]
18commands=15commands=
19 pytest systemtests/env_builder/ --maxfail=1 {posargs}16 pytest systemtests/env_builder/ --maxfail=1 {posargs}
2017
21[testenv:collect_sos_report]18[testenv:{collect_sos_report,general_tests}]
22commands=
23 pytest systemtests/collect_sos_report --log-file systemtes.collect_sos_rport.log --junitxml=junit.collect_sos_report.xml {posargs}
24
25[testenv:general_tests]
26commands=19commands=
27 pytest systemtests/general_tests --log-file systemtes.generaltests.log --junitxml=junit.general_tests.xml {posargs}20 pytest systemtests/{envname} --log-file systemtests.{envname}.log --junitxml=junit.{envname}.xml {posargs}
2821
29[testenv:cog]22[testenv:cog]
30deps=23deps=
@@ -40,11 +33,9 @@ commands=
40#machines = list(config.get("machines", {}).get("hardware", {}).keys())33#machines = list(config.get("machines", {}).get("hardware", {}).keys())
41#machines += list(config.get("machines", {}).get("vms", {}).get("instances", {}).keys())34#machines += list(config.get("machines", {}).get("vms", {}).get("instances", {}).keys())
42#print("Generating config for {}.".format(', '.join(machines)))35#print("Generating config for {}.".format(', '.join(machines)))
43#for machine in machines:36#cog.outl(f"[testenv:{{{','.join(machines)}}}]")
44# cog.outl(f'[testenv:{machine}]')37#cog.outl('commands=')
45# cog.outl('commands=')38#cog.outl(' pytest systemtests/tests_per_machine -k {envname} --log-file systemtests.{envname}.log --junitxml=junit.{envname}.xml {posargs}')
46# cog.outl(f' pytest systemtests/tests_per_machine -k "{machine}" --log-file systemtests.{machine}.log --junitxml=junit.{machine}.xml {{posargs}}')
47# cog.outl("")
48#]]]39#]]]
49#[[[end]]]40#[[[end]]]
5041

Subscribers

People subscribed via source and target branches

to all changes: