[r=allenap][bug=][author=jtv] Prepare for forthcoming changes in lp:~jtv/maas/apply-dhcp_interfaces.
These are some small changes to two tests that will make them more robust against changes in the later branch: writing DHCP config may write an extra file, and there are more tests coming that require a PservTestCase instead of a plain testtools.TestCase.