Mercurial > treepkg > treepkg
diff test/test_builder.py @ 344:f06f707d9fda
merged branches/scratchbox into trunk
#### IMPORTANT FOR ALL TREEPKGS #####
pbuilderrc config variable name changed to builderconfig
| author | Bjoern Ricks <bricks@intevation.de> |
|---|---|
| date | Fri, 23 Apr 2010 07:43:29 +0000 |
| parents | ce7be2fb93ee |
| children |
line wrap: on
line diff
--- a/test/test_builder.py Thu Apr 22 19:25:02 2010 +0000 +++ b/test/test_builder.py Fri Apr 23 07:43:29 2010 +0000 @@ -44,14 +44,14 @@ class TestPBuilder(PBuilderTests): def test_init_pbuilder(self): - """Tests the PBuilder.init_pbuilder method.""" + """Tests the PBuilder.init_builder method.""" basedir = self.create_temp_dir("pbuilder") pbuilderrc = os.path.join(basedir, "pbuilderrc") builder = PBuilder(pbuilderrc, self.root_command) old_stdout = sys.stdout sys.stdout = captured_stdout = StringIO.StringIO() try: - builder.init_pbuilder(distribution="etch", + builder.init_builder(distribution="etch", mirrorsite="http://example.com/debian", extramirrors=None) finally: @@ -62,7 +62,7 @@ "aptcache", "extra-pkg"] if not os.path.isdir(os.path.join(basedir, dirname))] if missing: - self.fail("init_pbuilder did not create these directories: %s" + self.fail("init_builder did not create these directories: %s" % " ".join(missing)) # check the pbuilderrc. This test is a little too strict @@ -104,7 +104,7 @@ % dict(basedir_repr=repr(basedir)[1:-1])) def test_init_pbuilder_run_twice(self): - """Tests whether PBuilder.init_pbuilder prints an error when run twice. + """Tests whether PBuilder.init_builder prints an error when run twice. """ basedir = self.create_temp_dir("pbuilder") @@ -114,7 +114,7 @@ old_stdout = sys.stdout sys.stdout = captured_stdout = StringIO.StringIO() try: - builder.init_pbuilder(distribution="etch", + builder.init_builder(distribution="etch", mirrorsite="http://example.com/debian", extramirrors=None) finally: @@ -127,7 +127,7 @@ sys.stderr = captured_stderr = StringIO.StringIO() try: try: - builder.init_pbuilder(distribution="etch", + builder.init_builder(distribution="etch", mirrorsite="http://example.com/debian", extramirrors=None) except SystemExit, exc: