comparison test/test_readconfig.py @ 440:383d23c6bfde

Merged revisions 346-386 via svnmerge from svn+ssh://svn.wald.intevation.org/treepkg/branches/treepkg-status ........ r346 | bricks | 2010-07-07 17:40:48 +0200 (Mi, 07 Jul 2010) | 2 lines added classed for treepkg status xml generation ........ r347 | bricks | 2010-07-08 12:07:39 +0200 (Do, 08 Jul 2010) | 10 lines renamed new status dir to info because of a naming conflict with status.py let the user specify a treepkg name in the config the name is propagated to PackagerGroup [treepkg] name: <treepkgname> becomes: pg = PackagerGroup(...) pg.name ........ r348 | bricks | 2010-07-08 15:25:07 +0200 (Do, 08 Jul 2010) | 3 lines moved test file to test main dir fixed missing : after def statement ........ r349 | bricks | 2010-07-08 17:59:52 +0200 (Do, 08 Jul 2010) | 2 lines added treepkg_dir andd tracks_dir attributes to PackageGroup ........ r350 | bricks | 2010-07-08 18:00:32 +0200 (Do, 08 Jul 2010) | 2 lines changed <millpath> to <trackspath> ........ r351 | bricks | 2010-07-08 18:08:39 +0200 (Do, 08 Jul 2010) | 2 lines check if config file exists to get usefull error output ........ r352 | bricks | 2010-07-08 18:11:13 +0200 (Do, 08 Jul 2010) | 2 lines write first info about tracks ........ r353 | bricks | 2010-07-09 12:20:49 +0200 (Fr, 09 Jul 2010) | 2 lines get all log files ........ r354 | bricks | 2010-07-09 14:42:42 +0200 (Fr, 09 Jul 2010) | 2 lines added md5sum function ........ r355 | bricks | 2010-07-09 15:15:15 +0200 (Fr, 09 Jul 2010) | 4 lines implemented nearly all info only arch and os info are missing ........ r356 | bricks | 2010-07-09 16:19:17 +0200 (Fr, 09 Jul 2010) | 2 lines Bugfix: source was not defined ........ r357 | bricks | 2010-07-09 16:44:52 +0200 (Fr, 09 Jul 2010) | 3 lines fixed some typos added missing add_checksum methond ........ r358 | bricks | 2010-07-09 17:06:15 +0200 (Fr, 09 Jul 2010) | 2 lines fixed status line for revision ........ r359 | bricks | 2010-07-12 14:10:34 +0200 (Mo, 12 Jul 2010) | 2 lines let the user specify num revisions that should be shown in the info ........ r360 | bricks | 2010-07-12 14:21:39 +0200 (Mo, 12 Jul 2010) | 2 lines missed in last commit ........ r361 | bricks | 2010-07-12 17:06:22 +0200 (Mo, 12 Jul 2010) | 2 lines add os config statement ........ r362 | bricks | 2010-07-12 17:47:42 +0200 (Mo, 12 Jul 2010) | 3 lines moved packages and logs to revision tag implemented os and arch info ........ r363 | bricks | 2010-07-13 14:23:28 +0200 (Di, 13 Jul 2010) | 2 lines updated test readconfig for os config variable ........ r364 | bricks | 2010-07-13 14:24:14 +0200 (Di, 13 Jul 2010) | 2 lines moved common publish functions to a seperate module ........ r365 | bricks | 2010-07-13 16:26:11 +0200 (Di, 13 Jul 2010) | 2 lines moved arch info to each package info ........ r366 | bricks | 2010-07-13 18:46:17 +0200 (Di, 13 Jul 2010) | 2 lines inital checkin for new publishpackages processing ........ r367 | bricks | 2010-07-21 17:52:15 +0200 (Mi, 21 Jul 2010) | 2 lines implemented parsing from xml string ........ r368 | bricks | 2010-07-22 12:17:42 +0200 (Do, 22 Jul 2010) | 2 lines copy binary-all packages in all binary-xyz dirs ........ r369 | bricks | 2010-07-22 12:26:40 +0200 (Do, 22 Jul 2010) | 2 lines fixed small bugs ........ r370 | bricks | 2010-07-22 13:02:36 +0200 (Do, 22 Jul 2010) | 2 lines added a new root element which is called TreepkgRoot for Treepkg Info classes ........ r371 | bricks | 2010-07-22 13:09:52 +0200 (Do, 22 Jul 2010) | 3 lines fixed some small issues remember: run pychecker BEFORE the commit ........ r372 | bricks | 2010-07-22 18:01:43 +0200 (Do, 22 Jul 2010) | 2 lines improved publishdebianpackages and fixed a lot of bugs in the xml info parsing part ........ r373 | bricks | 2010-07-23 18:40:38 +0200 (Fr, 23 Jul 2010) | 2 lines implemented CacheDb to store copied Packages from build host ........ r374 | bricks | 2010-07-26 10:28:48 +0200 (Mo, 26 Jul 2010) | 2 lines moved data handling in publishdebianpackages into seperate module ........ r375 | bricks | 2010-07-26 11:42:07 +0200 (Mo, 26 Jul 2010) | 2 lines fixed some typos ........ r376 | bricks | 2010-07-26 12:12:40 +0200 (Mo, 26 Jul 2010) | 2 lines first version of incremental copying debian packages to cachedir ........ r377 | bricks | 2010-07-26 14:58:50 +0200 (Mo, 26 Jul 2010) | 2 lines incremental copying only changed debian packages ........ r378 | bricks | 2010-07-26 15:39:10 +0200 (Mo, 26 Jul 2010) | 3 lines use md5 instead of hashlib module (md5 is deprecated in favour of hashlib in python 2.5) ........ r379 | bricks | 2010-07-26 15:46:19 +0200 (Mo, 26 Jul 2010) | 2 lines make treepkg compatible to python 2.4 ........ r380 | bricks | 2010-07-26 15:50:49 +0200 (Mo, 26 Jul 2010) | 2 lines fixed last commit (db instead of sqlite3) ........ r381 | bricks | 2010-07-27 10:54:15 +0200 (Di, 27 Jul 2010) | 2 lines fixed wrong import statement ........ r382 | bricks | 2010-07-27 10:54:34 +0200 (Di, 27 Jul 2010) | 2 lines removed unnecessary debug output ........ r383 | bricks | 2010-07-27 18:28:22 +0200 (Di, 27 Jul 2010) | 2 lines check if upload hook is empty ........ r384 | bricks | 2010-07-28 09:35:21 +0200 (Mi, 28 Jul 2010) | 2 lines run rsync only an arch dirs that are present in the current treepkg ........ r385 | bricks | 2010-07-28 09:35:54 +0200 (Mi, 28 Jul 2010) | 2 lines add helper tool to list content of a cache db ........ r386 | bricks | 2010-07-28 10:33:48 +0200 (Mi, 28 Jul 2010) | 3 lines fixed a typo regex fails if option is empty ........
author Bjoern Ricks <bricks@intevation.de>
date Fri, 06 Aug 2010 13:28:47 +0000
parents f9cd55aea87d
children 296d26453e2a
comparison
equal deleted inserted replaced
427:25d702bb13f9 440:383d23c6bfde
32 handle_dependencies: False 32 handle_dependencies: False
33 33
34 [treepkg] 34 [treepkg]
35 instructions_file: %(treepkg_dir)s/instructions 35 instructions_file: %(treepkg_dir)s/instructions
36 check_interval: 3600 36 check_interval: 3600
37 name: testtreepkg
37 38
38 [pkg_simple] 39 [pkg_simple]
39 pkg_basename: simple1 40 pkg_basename: simple1
40 svn_url: svn://example.com/%(name)s/trunk 41 svn_url: svn://example.com/%(name)s/trunk
41 base_dir: %(tracks_dir)s/%(name)s 42 base_dir: %(tracks_dir)s/%(name)s
42 packager_class: readconfig_test.%(name)s 43 packager_class: readconfig_test.%(name)s
43 handle_dependencies: True 44 handle_dependencies: True
44 signing_key_id: abcd1234 45 signing_key_id: abcd1234
45 changelog_msg_template: Update to feature branch r%%(revision)s 46 changelog_msg_template: Update to feature branch r%%(revision)s
46 version_template: 1.0.svn%%(revision)s 47 version_template: 1.0.svn%%(revision)s
48 os: foo os
47 49
48 [pkg_extraargs] 50 [pkg_extraargs]
49 svn_url: svn://example.com/%(name)s/trunk 51 svn_url: svn://example.com/%(name)s/trunk
50 svn_subset: -N . 52 svn_subset: -N .
51 subdir 53 subdir
53 base_dir: %(tracks_dir)s/%(name)s 55 base_dir: %(tracks_dir)s/%(name)s
54 packager_class: readconfig_test.extraargs 56 packager_class: readconfig_test.extraargs
55 orig_tarball: %(base_dir)s/mytarball.tgz 57 orig_tarball: %(base_dir)s/mytarball.tgz
56 rules_svn_url: file:///tmp/my-debian-repository 58 rules_svn_url: file:///tmp/my-debian-repository
57 deb_build_options: parallel=2 59 deb_build_options: parallel=2
60 os: bar os
58 """ 61 """
59 62
60 files = [("treepkg.cfg", config_contents), 63 files = [("treepkg.cfg", config_contents),
61 ("readconfig_test", 64 ("readconfig_test",
62 [("__init__.py", ""), 65 [("__init__.py", ""),
80 def test_readconfig(self): 83 def test_readconfig(self):
81 config_file = os.path.join(self.directory, "treepkg.cfg") 84 config_file = os.path.join(self.directory, "treepkg.cfg")
82 treepkg_opts, packager_opts = read_config(config_file) 85 treepkg_opts, packager_opts = read_config(config_file)
83 self.assertEquals(treepkg_opts, 86 self.assertEquals(treepkg_opts,
84 dict(instructions_file="/home/builder/mill/instructions", 87 dict(instructions_file="/home/builder/mill/instructions",
85 check_interval=3600)) 88 check_interval=3600,
89 name="testtreepkg",
90 treepkg_dir="/home/builder/mill",
91 tracks_dir="/home/builder/mill/tracks"))
86 self.assertEquals(sorted(packager_opts, 92 self.assertEquals(sorted(packager_opts,
87 key=operator.itemgetter("name")), 93 key=operator.itemgetter("name")),
88 [ 94 [
89 dict(name="extraargs", 95 dict(name="extraargs",
90 base_dir="/home/builder/mill/tracks/extraargs", 96 base_dir="/home/builder/mill/tracks/extraargs",
109 version_template="%(revision)s", 115 version_template="%(revision)s",
110 orig_tarball=("/home/builder/mill/" 116 orig_tarball=("/home/builder/mill/"
111 "tracks/extraargs/mytarball.tgz"), 117 "tracks/extraargs/mytarball.tgz"),
112 git_url="", 118 git_url="",
113 git_branch="", 119 git_branch="",
114 builder_cls="PBuilder"), 120 builder_cls="PBuilder",
121 os="bar os"),
115 dict(name="simple", 122 dict(name="simple",
116 base_dir="/home/builder/mill/tracks/simple", 123 base_dir="/home/builder/mill/tracks/simple",
117 changelog_msg_template=("Update to feature branch" 124 changelog_msg_template=("Update to feature branch"
118 " r%(revision)s"), 125 " r%(revision)s"),
119 deb_email="treepkg@example.com", 126 deb_email="treepkg@example.com",
131 svn_subset=[], 138 svn_subset=[],
132 svn_url="svn://example.com/simple/trunk", 139 svn_url="svn://example.com/simple/trunk",
133 version_template="1.0.svn%(revision)s", 140 version_template="1.0.svn%(revision)s",
134 git_url="", 141 git_url="",
135 git_branch="", 142 git_branch="",
136 builder_cls="PBuilder")]) 143 builder_cls="PBuilder",
144 os="foo os")])
145
146 def main():
147 unittest.main()
148
149 if __name__ == "__main__":
150 main()
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)