# HG changeset patch # User Bjoern Ricks # Date 1278595507 0 # Node ID 1af04bfbb1d08dde67e49bd3dbdc3f564297c320 # Parent c1f3be727f9d0c721671a8eaf946ac25b1006a7f moved test file to test main dir fixed missing : after def statement diff -r c1f3be727f9d -r 1af04bfbb1d0 test/status/test_status.py --- a/test/status/test_status.py Thu Jul 08 10:07:39 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# Copyright (C) 2010 by Intevation GmbH -# Authors: -# Bjoern Ricks -# -# This program is free software under the GPL (>=v2) -# Read the file COPYING coming with the software for details. - -"""Tests for treepkg.status.status""" - -import unittest -import os.path -import sys - -test_dir = os.path.dirname(__file__) -sys.path.append(os.path.join(test_dir, os.pardir, os.pardir)) - -from treepkg.status.status import TreepkgStatus - -class TreepkgStatusTest(unittest.TestCase): - - def test_toxml(self): - status = TreepkgStatus("testtreepkg") - dom = status.toxml() - xml = dom.toxml() - self.assertEquals("testtreepkg", xml) - -if __name__ == '__main__': - unittest.main() - diff -r c1f3be727f9d -r 1af04bfbb1d0 test/test_info.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/test_info.py Thu Jul 08 13:25:07 2010 +0000 @@ -0,0 +1,86 @@ +# Copyright (C) 2010 by Intevation GmbH +# Authors: +# Bjoern Ricks +# +# This program is free software under the GPL (>=v2) +# Read the file COPYING coming with the software for details. + +"""Tests for treepkg.status.status""" + +import unittest +import os.path +import sys + +test_dir = os.path.dirname(__file__) +sys.path.append(os.path.join(test_dir, os.pardir)) + +from treepkg.info.status import TreepkgInfo +from treepkg.report import get_packager_group +from filesupport import FileTestMixin + +class TreepkgInfoExampleTest(unittest.TestCase, FileTestMixin): + config_contents = """\ +[DEFAULT] +treepkg_dir: /home/builder/mill +tracks_dir: %(treepkg_dir)s/tracks +root_cmd: sudo +pbuilder_dir: %(treepkg_dir)s/pbuilder +builderconfig: %(pbuilder_dir)s/pbuilderrc +deb_email: treepkg@example.com +deb_fullname: TreePKG +pkg_revision_template: treepkg%%(pkg_revision)s +handle_dependencies: False + +[treepkg] +instructions_file: %(treepkg_dir)s/instructions +check_interval: 3600 +name: testtreepkginfo + +[pkg_simple] +pkg_basename: simple1 +svn_url: svn://example.com/%(name)s/trunk +base_dir: %(tracks_dir)s/%(name)s +packager_class: treepkginfo_test.%(name)s +handle_dependencies: True +signing_key_id: abcd1234 +changelog_msg_template: Update to feature branch r%%(revision)s +version_template: 1.0.svn%%(revision)s + +""" + + files = [("treepkg.cfg", config_contents), + ("treepkginfo_test", + [("__init__.py", ""), + ("simple.py", + "\n".join(["class SourcePackager:", + " pass", + ""])), + ])] + + def setUp(self): + self.directory = self.create_files("treepkg", self.files) + self.old_path = sys.path + sys.path = [self.directory] + sys.path + + def tearDown(self): + sys.path = self.old_path + + def test_createinfo(self): + config_file = os.path.join(self.directory, "treepkg.cfg") + group = get_packager_group(config_file) + tpginfo = TreepkgInfo(group.name) + print tpginfo.toxml().toxml() + self.assertEquals("testtreepkginfo", tpginfo.name) + + +class TreepkgInfoTest(unittest.TestCase): + + def test_toxml(self): + status = TreepkgInfo("testtreepkg") + dom = status.toxml() + xml = dom.toxml() + self.assertEquals("testtreepkg", xml) + +if __name__ == '__main__': + unittest.main() + diff -r c1f3be727f9d -r 1af04bfbb1d0 treepkg/info/status.py --- a/treepkg/info/status.py Thu Jul 08 10:07:39 2010 +0000 +++ b/treepkg/info/status.py Thu Jul 08 13:25:07 2010 +0000 @@ -21,7 +21,7 @@ root = doc.documentElement return (doc, root) -class TreepkgStatus: +class TreepkgInfo: def __init__(self, name, treepkgpath=None, millpath=None, version=None): self.name = name @@ -150,7 +150,7 @@ self.name = name self.path = path - def toxml(self) + def toxml(self): (doc, root) = createTpkgRoot("log") # add nameele = createTpkgElement(doc, "name")