Merge lp:~allenap/maas/remove-test.config into lp:~maas-committers/maas/trunk

Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 5637
Proposed branch: lp:~allenap/maas/remove-test.config
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 62 lines (+0/-27)
2 files modified
Makefile (+0/-6)
buildout.cfg (+0/-21)
To merge this branch: bzr merge lp:~allenap/maas/remove-test.config
Reviewer Review Type Date Requested Status
Lee Trager (community) Approve
Review via email: mp+314522@code.launchpad.net

Commit message

Remove test.config; it's no longer used.

The tests it previously ran are now run by test.rack.

To post a comment you must log in.
Revision history for this message
Lee Trager (ltrager) wrote :

Thanks for cleaning this up!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2017-01-10 15:22:24 +0000
3+++ Makefile 2017-01-11 13:04:35 +0000
4@@ -61,7 +61,6 @@
5 bin/twistd.region \
6 bin/test.cli \
7 bin/test.rack \
8- bin/test.config \
9 bin/test.region \
10 bin/test.region.legacy \
11 bin/test.testing \
12@@ -163,10 +162,6 @@
13 $(buildout) install rack-test
14 @touch --no-create $@
15
16-bin/test.config: bin/buildout buildout.cfg versions.cfg setup.py
17- $(buildout) install config-test
18- @touch --no-create $@
19-
20 bin/flake8: bin/buildout buildout.cfg versions.cfg setup.py
21 $(buildout) install flake8
22 @touch --no-create $@
23@@ -217,7 +212,6 @@
24 define test-scripts
25 bin/test.cli
26 bin/test.rack
27- bin/test.config
28 bin/test.region
29 bin/test.region.legacy
30 bin/test.testing
31
32=== modified file 'buildout.cfg'
33--- buildout.cfg 2016-12-22 15:53:30 +0000
34+++ buildout.cfg 2017-01-11 13:04:35 +0000
35@@ -303,27 +303,6 @@
36 scripts =
37 test.rack
38
39-[config-test]
40-recipe = zc.recipe.egg
41-eggs =
42- ${common:test-eggs}
43-entry-points =
44- test.config=maastesting.noseplug:main
45-initialization =
46- ${common:initialization}
47- options = [
48- "--with-resources",
49- "--with-scenarios",
50- "--with-select",
51- "--select-dir=etc/maas/templates/commissioning-user-data",
52- "--cover-package=snippets",
53- "--cover-branches",
54- ]
55- ${common:inject-test-options}
56-extra-paths = ${common:extra-paths}
57-scripts =
58- test.config
59-
60 [e2e-test]
61 recipe = zc.recipe.egg
62 eggs =