Mercurial > treepkg
comparison test/test_builder.py @ 209:cbcd8f549ff7
Make logfile and binary_dir parameters of PBuilder.build optional.
Adapt test cases to changed order of pbuild command line arguments.
author | Bernhard Herzog <bh@intevation.de> |
---|---|
date | Fri, 14 Nov 2008 19:41:03 +0000 |
parents | e3ab8aca2b08 |
children | ce7be2fb93ee |
comparison
equal
deleted
inserted
replaced
208:1527c37bd7aa | 209:cbcd8f549ff7 |
---|---|
188 builder.build("my_dsc_file", binary_dir_name, logfilename, | 188 builder.build("my_dsc_file", binary_dir_name, logfilename, |
189 bindmounts=["/home/builder/tracks", | 189 bindmounts=["/home/builder/tracks", |
190 "/home/builder/pbuilder"]) | 190 "/home/builder/pbuilder"]) |
191 self.check_command_line(['/usr/sbin/pbuilder', 'build', | 191 self.check_command_line(['/usr/sbin/pbuilder', 'build', |
192 '--configfile', 'my_pbuilderrc', | 192 '--configfile', 'my_pbuilderrc', |
193 '--logfile', logfilename, | |
194 '--buildresult', binary_dir_name, | |
193 '--bindmounts', "/home/builder/tracks", | 195 '--bindmounts', "/home/builder/tracks", |
194 '--bindmounts', "/home/builder/pbuilder", | 196 '--bindmounts', "/home/builder/pbuilder", |
195 '--logfile', logfilename, | |
196 '--buildresult', binary_dir_name, | |
197 '--debbuildopts', '-b', | 197 '--debbuildopts', '-b', |
198 'my_dsc_file']) | 198 'my_dsc_file']) |
199 self.failUnless(os.path.isdir(binary_dir_name)) | 199 self.failUnless(os.path.isdir(binary_dir_name)) |
200 | 200 |
201 def test_build_with_extra_packages(self): | 201 def test_build_with_extra_packages(self): |
211 builder = PBuilder("my_pbuilderrc", self.root_command) | 211 builder = PBuilder("my_pbuilderrc", self.root_command) |
212 builder.build("my_dsc_file", binary_dir_name, logfilename, | 212 builder.build("my_dsc_file", binary_dir_name, logfilename, |
213 extra_packages=["subversion", "texinfo"]) | 213 extra_packages=["subversion", "texinfo"]) |
214 self.check_command_line(['/usr/sbin/pbuilder', 'build', | 214 self.check_command_line(['/usr/sbin/pbuilder', 'build', |
215 '--configfile', 'my_pbuilderrc', | 215 '--configfile', 'my_pbuilderrc', |
216 '--logfile', logfilename, | |
217 '--buildresult', binary_dir_name, | |
216 '--extrapackages', "subversion", | 218 '--extrapackages', "subversion", |
217 '--extrapackages', "texinfo", | 219 '--extrapackages', "texinfo", |
218 '--logfile', logfilename, | |
219 '--buildresult', binary_dir_name, | |
220 '--debbuildopts', '-b', | 220 '--debbuildopts', '-b', |
221 'my_dsc_file']) | 221 'my_dsc_file']) |
222 self.failUnless(os.path.isdir(binary_dir_name)) | 222 self.failUnless(os.path.isdir(binary_dir_name)) |
223 | 223 |
224 def test_build_with_extra_env(self): | 224 def test_build_with_extra_env(self): |