Merge lp:~javier.collado/utah/bug1061011 into lp:utah
Status: | Merged |
---|---|
Merged at revision: | 702 |
Proposed branch: | lp:~javier.collado/utah/bug1061011 |
Merge into: | lp:utah |
Diff against target: |
188 lines (+92/-38) 3 files modified
tests/test_preseed.py (+46/-0) utah/preseed.py (+40/-36) utah/provisioning/provisioning.py (+6/-2) |
To merge this branch: | bzr merge lp:~javier.collado/utah/bug1061011 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Max Brustkern (community) | Approve | ||
Review via email: mp+128497@code.launchpad.net |
Description of the change
As agreed in the bugs comments, this branch adds a new exception to the preseed
module, so that the traceback when a duplicated question name is found in the
preseed file is clearer. In particular, the new traceback would be something
like this:
File "/home/
raise DuplicatedQuest
utah.preseed.
In addition to this a new module with a few simple test cases have been added
to the tests/ directory (they can be executed with nosetests tests/). I'm not
sure if that's the best location for server test cases, but I haven't found any
other test cases and this one looks fine to me since the files under tests/
aren't included in the binary package. Anyway, under tests/ there's already a
script that is used to run the client test cases, but I guess we can have both
things together.
In the future, we could also have a jenkins job to run the test cases for the
server as there is already one to run the test cases for the client.
I like that new exception. If you've already tested this, we should be good to go ahead and merge, otherwise, I'll try to test it.