← Back to branch summary

~lutostag/ubuntu/trusty/maas/1.5.4+keystone

« back to all changes in this revision

Viewing changes to src/provisioningserver/dhcp/tests/test_writer.py

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez
  • Date: 2013-03-04 11:49:44 UTC
  • mto: This revision was merged to the branch mainline in revision 25.
  • Revision ID: package-import@ubuntu.com-20130304114944-azcvu9anlf8mizpa
Tags: upstream-1.3+bzr1452+dfsg
Import upstream version 1.3+bzr1452+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/dhcp/tests/test_writer.py
21
21
    )
22
22
import sys
23
23
 
 
24
from maastesting import root
24
25
from maastesting.matchers import ContainsAll
25
26
from maastesting.testcase import TestCase
26
 
import provisioningserver
27
27
from provisioningserver.dhcp import writer
28
28
from testtools.matchers import MatchesStructure
29
29
 
43
43
        )
44
44
 
45
45
    def test_script_executable(self):
46
 
        dev_root = os.path.join(
47
 
            os.path.dirname(provisioningserver.__file__),
48
 
            os.pardir, os.pardir)
49
 
        script = ["%s/bin/maas-provision" % dev_root, "generate-dhcp-config"]
 
46
        script = ["%s/bin/maas-provision" % root, "generate-dhcp-config"]
50
47
        script.extend(self.test_args)
51
48
        cmd = Popen(
52
49
            script, stdout=PIPE, env=dict(PYTHONPATH=":".join(sys.path)))