The branch, master has been updated via 0f3f63f PEP8: line up a couple of lists via aa5db3d PEP8: improve formatting around various operators via 0632085 PEP8: improve formatting around bit-wise OR ("|") via 944a460 dcerpc py tests: improve argument formatting via d246eec dcerpc/dns_server tests: use record malformed as probably intended via 08d1573 PEP8: add spaces after operators via 333bc32 PEP8: better formatting of (CONST1|CONST2) via 5d0dc38 ldb tests: remove unused code from match_rules.py via 2ccb0b0 PEP8: improve spacing around colons via 9c750ad PEP8: more space before equals via 4284f60 PEP8: add pycodestyle config in setup.cfg via c9f2fde PEP8: fix W391: blank line at end of file via 6f9eb61 PEP8: fix W293: blank line contains whitespace via aa243d1 PEP8: fix W291: trailing whitespace via 9f5bbcc PEP8: fix E713: test for membership should be 'not in' via 1676a4d PEP8: fix E712: comparison to False should be 'if cond is False:' or 'if not cond:' via e940e4c PEP8: fix E711: comparison to None should be 'if cond is not None:' via cabb299 PEP8: fix E703: statement ends with a semicolon via d23170c PEP8: fix E701: multiple statements on one line (colon) via 7b031b0 PEP8: fix E502: the backslash is redundant between brackets via 95c36d8 PEP8: fix E401: multiple imports on one line via 4d529c4 PEP8: fix E306: expected 1 blank line before a nested definition, found 0 via 115f2a7 PEP8: fix E305: expected 2 blank lines after class or function definition, found 1 via fd6b208 PEP8: fix E303: too many blank lines (2) via 211c9a5 PEP8: fix E302: expected 2 blank lines, found 1 via 542e91e PEP8: fix E301: expected 1 blank line, found 0 via 7a07d42 PEP8: fix E265: block comment should start with '# ' via c809a86 PEP8: fix E261: at least two spaces before inline comment via 1ccc36b PEP8: fix E251: unexpected spaces around keyword / parameter equals via 40ef91f PEP8: fix E241: multiple spaces after ',' via 12d3fbe PEP8: fix E231: missing whitespace after ',' via 35de422 PEP8: fix E228: missing whitespace around modulo operator via e1edeae PEP8: fix E227: missing whitespace around bitwise or shift operator via 87bbc2d PEP8: fix E226: missing whitespace around arithmetic operator via 32266d2 PEP8: fix E225: missing whitespace around operator via fb5ea35 PEP8: fix E222: multiple spaces after operator via d9c282a PEP8: fix E211: whitespace before '(' via ba0827b PEP8: fix E203: whitespace before ':' via 562411b PEP8: fix E202: whitespace before ')' via a9551ed PEP8: fix E201: whitespace after '(' via 944d704 PEP8: fix E131: continuation line unaligned for hanging indent via 5d53254 PEP8: fix E128: continuation line under-indented for visual indent via bbb9f57 PEP8: fix E127: continuation line over-indented for visual indent via aa163f1 PEP8: fix E125: continuation line with same indent as next logical line via dba0c7e PEP8: fix E124: closing bracket does not match visual indentation via 484ce06 PEP8: fix E123: closing bracket does not match indentation of opening bracket's line via 297faf3 PEP8: fix E122: continuation line missing indentation or outdented via b43408b PEP8: fix E121: continuation line under-indented for hanging indent via 5037731 PEP8: fix E116: unexpected indentation (comment) via eba81f7 PEP8: fix E115: expected an indented block (comment) via 4fc08d8 PEP8: fix E111: indentation is not a multiple of four via ada5af5 PEP8: whitespace fixes in wintest.py via 086daf5 PEP8: fix E101: indentation contains mixed spaces and tabs via 1c5fa5d PEP8: fix W602: deprecated form of raising exception via 3606a49 PEP8: fix W601: .has_key() is deprecated, use 'in' via d7863ff PEP8: fix E731: do not assign a lambda expression, use a def via 5027405 PEP8: fix E714: test for object identity should be 'is not' via e551f5f PEP8: fix E713: test for membership should be 'not in' via 831bb35 PEP8: fix E271: multiple spaces after keyword from 8c14234 vfs_fruit: Don't unlink the main file
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 0f3f63f2d80b023eab9da0db14d65a9069f9e2c4 Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Date: Wed Aug 22 18:27:10 2018 +1200 PEP8: line up a couple of lists Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Autobuild-User(master): Douglas Bagnall <dbagn...@samba.org> Autobuild-Date(master): Fri Aug 24 10:58:16 CEST 2018 on sn-devel-144 commit aa5db3da2b399cdcfaa1d9bf0cb0d3ea34140975 Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Date: Wed Aug 22 18:26:48 2018 +1200 PEP8: improve formatting around various operators Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit 06320851424a8d1368565f63b3c12a5ea273a111 Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Date: Wed Aug 22 18:26:09 2018 +1200 PEP8: improve formatting around bit-wise OR ("|") Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit 944a4609c71493250e2fa27cdf9a665dd503da99 Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Date: Wed Aug 22 17:18:43 2018 +1200 dcerpc py tests: improve argument formatting Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit d246eec035fd5c3e46acd1c1f027bdd20a1523bc Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Date: Wed Aug 22 17:11:45 2018 +1200 dcerpc/dns_server tests: use record malformed as probably intended Both ways the record is malformed, but it is more likely we meant AAAAAAAAAA... 1 than A 1A 1A 1A 1A ... Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit 08d1573bd5b0dd3982dfe0971a1cf2aef234cfa7 Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Date: Wed Aug 22 17:09:01 2018 +1200 PEP8: add spaces after operators Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit 333bc327c0256b505c5ee651968deba06a046036 Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Date: Wed Aug 22 17:06:23 2018 +1200 PEP8: better formatting of (CONST1|CONST2) Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit 5d0dc38cfed6b1966d41201d93bc321fbf80f0f6 Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Date: Wed Aug 22 16:30:02 2018 +1200 ldb tests: remove unused code from match_rules.py Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit 2ccb0b0384304e88ff390b1a8974a9dca09c6528 Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Date: Wed Aug 22 09:35:58 2018 +1200 PEP8: improve spacing around colons These dropped out of Joe's patches during rebase and review. Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit 9c750ad7caa99a028b10c81ac709918f1028f40b Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Date: Wed Aug 22 09:34:05 2018 +1200 PEP8: more space before equals This dropped out during rebase Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit 4284f6042976a8d4a6fdb58edb66d198f64c87ae Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:25:46 2018 +1200 PEP8: add pycodestyle config in setup.cfg Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit c9f2fdea1dc91bf692fba2b74882371b0b35e1dc Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:22:54 2018 +1200 PEP8: fix W391: blank line at end of file Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 6f9eb617e375c2272547517af22775dd7afee428 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:22:53 2018 +1200 PEP8: fix W293: blank line contains whitespace Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit aa243d1a7f64c474265b7f735601139ab9ff7b92 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:22:52 2018 +1200 PEP8: fix W291: trailing whitespace Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 9f5bbcc10a82f409f41cce5685458332674e2010 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:22:34 2018 +1200 PEP8: fix E713: test for membership should be 'not in' Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 1676a4dcae505142036dff49eb4d65ff6e9854b2 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:22:19 2018 +1200 PEP8: fix E712: comparison to False should be 'if cond is False:' or 'if not cond:' Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit e940e4cd48fa866cdb81e38d7786aac953f30bdf Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:22:15 2018 +1200 PEP8: fix E711: comparison to None should be 'if cond is not None:' Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit cabb299749388ebfda74571753e7b0209d32b266 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:22:11 2018 +1200 PEP8: fix E703: statement ends with a semicolon Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit d23170c961194234ef6131482233405cdd55a349 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:22:02 2018 +1200 PEP8: fix E701: multiple statements on one line (colon) Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 7b031b01a1fa458cb118e5fb38faf20bd5379e5c Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:22:01 2018 +1200 PEP8: fix E502: the backslash is redundant between brackets Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 95c36d825c68505dd28fda2a1bf7bcc707c523ad Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:21:38 2018 +1200 PEP8: fix E401: multiple imports on one line Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 4d529c400ba966ff633812a0f9f6a46862bd9e56 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:21:32 2018 +1200 PEP8: fix E306: expected 1 blank line before a nested definition, found 0 Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 115f2a71b883567dcf324da5cd02cfc3c86431b4 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:21:29 2018 +1200 PEP8: fix E305: expected 2 blank lines after class or function definition, found 1 Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit fd6b2086cbf03d8dd0b46160f345bf7cc5551aeb Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:21:11 2018 +1200 PEP8: fix E303: too many blank lines (2) Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 211c9a5f85bffbb012b4567bad265c9339588fbf Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:20:39 2018 +1200 PEP8: fix E302: expected 2 blank lines, found 1 Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 542e91ef9222302303d2ecc10dceb96d1b0d5bab Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:19:59 2018 +1200 PEP8: fix E301: expected 1 blank line, found 0 Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 7a07d4223028ed34cca20d2fcdf4f1bca1856c8b Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:19:49 2018 +1200 PEP8: fix E265: block comment should start with '# ' Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit c809a86023a2eb1c6802c8b3aa68c00f1ea03952 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:19:33 2018 +1200 PEP8: fix E261: at least two spaces before inline comment Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 1ccc36b4010cd63b1b63f4c0145466b8e09eb798 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:19:21 2018 +1200 PEP8: fix E251: unexpected spaces around keyword / parameter equals Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 40ef91fb410e609c1dc02d95daeafbd5f7ef28a9 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:19:11 2018 +1200 PEP8: fix E241: multiple spaces after ',' Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 12d3fbe15cb58b57c60499103101e3a845378859 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:19:05 2018 +1200 PEP8: fix E231: missing whitespace after ',' Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 35de42275bc8475466ef29d1e2c2c7391c9f769b Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:18:34 2018 +1200 PEP8: fix E228: missing whitespace around modulo operator Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit e1edeae83c0519c5865247500b8432ff2ab47dab Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:18:32 2018 +1200 PEP8: fix E227: missing whitespace around bitwise or shift operator Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 87bbc2df972d112870bb7d5c8839663affe62b21 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:18:25 2018 +1200 PEP8: fix E226: missing whitespace around arithmetic operator Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 32266d2d48c1c38e54bcfaf1cad36f09e9cff355 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:18:03 2018 +1200 PEP8: fix E225: missing whitespace around operator Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit fb5ea356dd2dcf7651ff2b0fb861042ed828821c Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:17:44 2018 +1200 PEP8: fix E222: multiple spaces after operator Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit d9c282a9a599c48bd4c772d80059a364e1d2d61b Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:17:15 2018 +1200 PEP8: fix E211: whitespace before '(' Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit ba0827b560c8165bcbb4017a6377778934ad9bb9 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:17:14 2018 +1200 PEP8: fix E203: whitespace before ':' Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 562411bd9587bdd011bd70e25f9763c38a8af401 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:17:02 2018 +1200 PEP8: fix E202: whitespace before ')' Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit a9551edaeebdb2e8c209a843bae7088e60946e96 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:16:43 2018 +1200 PEP8: fix E201: whitespace after '(' Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 944d70435e4859a626b875c18535c1adb7c3e66f Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:16:26 2018 +1200 PEP8: fix E131: continuation line unaligned for hanging indent Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 5d532543abdcb605fd1432eeaa36135bdac8a884 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:16:12 2018 +1200 PEP8: fix E128: continuation line under-indented for visual indent Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit bbb9f57603de490b39e5ad1b71e36f127291194b Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:15:34 2018 +1200 PEP8: fix E127: continuation line over-indented for visual indent Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit aa163f1a9c858203d900bbeda0e76ca247d0eace Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:14:45 2018 +1200 PEP8: fix E125: continuation line with same indent as next logical line Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit dba0c7ebe5e91a6124e48a62a28f460c2fc9bf79 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:14:43 2018 +1200 PEP8: fix E124: closing bracket does not match visual indentation Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 484ce0634b020853edf0c5432e08523884199b1e Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:14:37 2018 +1200 PEP8: fix E123: closing bracket does not match indentation of opening bracket's line Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 297faf325225e06f9658457513044631d62e3dbe Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:14:21 2018 +1200 PEP8: fix E122: continuation line missing indentation or outdented Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit b43408b383d06d7c0c87b8f6e9549544fc057bc2 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:14:13 2018 +1200 PEP8: fix E121: continuation line under-indented for hanging indent Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 5037731e0dad92c9d538eb3cd437b8b672df865b Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:14:03 2018 +1200 PEP8: fix E116: unexpected indentation (comment) Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit eba81f7fa92ec807da6a78976fc3105157f592a4 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:14:00 2018 +1200 PEP8: fix E115: expected an indented block (comment) Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 4fc08d8f14e281fb7492d5a196e456637406c514 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:13:57 2018 +1200 PEP8: fix E111: indentation is not a multiple of four Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit ada5af53f7502aaacd9cebb35a3e3288ec5b24bc Author: Joe Guo <j...@catalyst.net.nz> Date: Tue Aug 21 11:47:07 2018 +1200 PEP8: whitespace fixes in wintest.py Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 086daf5f36bb832ced6b5e38ccdbb66e7a2a459e Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 18:13:51 2018 +1200 PEP8: fix E101: indentation contains mixed spaces and tabs Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 1c5fa5dc0ee47de0bb6edc39a4dfe2295afb4bff Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 16:11:40 2018 +1200 PEP8: fix W602: deprecated form of raising exception Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 3606a49c7338fd6b0bf96280bfd1ace001f8f24e Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 16:43:51 2018 +1200 PEP8: fix W601: .has_key() is deprecated, use 'in' Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit d7863ffe5d9d6ac7d1312ca55dd0a0203de09491 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 16:35:43 2018 +1200 PEP8: fix E731: do not assign a lambda expression, use a def Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 5027405d0c3c738a42afc4a10938b8d22ab8e240 Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 15:45:18 2018 +1200 PEP8: fix E714: test for object identity should be 'is not' Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit e551f5f50295e16aa56e80a5991a55d2d7b8a36d Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 14:56:46 2018 +1200 PEP8: fix E713: test for membership should be 'not in' Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> commit 831bb3575d7e2151d670a1cc2ecae8e6e06a573d Author: Joe Guo <j...@catalyst.net.nz> Date: Mon Jul 30 15:42:42 2018 +1200 PEP8: fix E271: multiple spaces after keyword Signed-off-by: Joe Guo <j...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: .ycm_extra_conf.py | 1 + auth/credentials/tests/bind.py | 12 +- examples/logon/ntlogon/ntlogon.py | 5 +- .../vfs/media_harmony/trigger_avid_update.py | 7 +- lib/ldb-samba/tests/match_rules.py | 909 +++++++++++---------- lib/ldb/_ldb_text.py | 1 + lib/ldb/tests/python/api.py | 84 +- lib/ldb/tests/python/index.py | 14 +- lib/talloc/test_pytalloc.py | 2 + lib/tevent/bindings.py | 4 + lib/tevent/tevent.py | 2 +- python/examples/dnsserver.py | 1 - python/examples/netbios.py | 6 +- python/examples/samr.py | 22 +- python/examples/winreg.py | 7 +- python/samba/__init__.py | 31 +- python/samba/common.py | 4 +- python/samba/compat.py | 2 +- python/samba/dbchecker.py | 69 +- python/samba/descriptor.py | 500 ++++++------ python/samba/dnsserver.py | 13 +- python/samba/drs_utils.py | 8 +- python/samba/emulate/traffic.py | 16 +- python/samba/emulate/traffic_packets.py | 1 + python/samba/getopt.py | 40 +- python/samba/gp_ext_loader.py | 5 +- python/samba/gp_sec_ext.py | 41 +- python/samba/gpclass.py | 51 +- python/samba/graph.py | 28 +- python/samba/hostconfig.py | 3 +- python/samba/idmap.py | 7 +- python/samba/join.py | 254 +++--- python/samba/kcc/__init__.py | 24 +- python/samba/kcc/debug.py | 3 +- python/samba/kcc/graph.py | 8 +- python/samba/kcc/kcc_utils.py | 7 +- python/samba/ms_display_specifiers.py | 9 +- python/samba/ms_forest_updates_markdown.py | 5 +- python/samba/ms_schema.py | 35 +- python/samba/ms_schema_markdown.py | 3 + python/samba/ndr.py | 5 +- python/samba/netcmd/__init__.py | 44 +- python/samba/netcmd/common.py | 4 +- python/samba/netcmd/computer.py | 34 +- python/samba/netcmd/dbcheck.py | 20 +- python/samba/netcmd/delegation.py | 57 +- python/samba/netcmd/dns.py | 157 ++-- python/samba/netcmd/domain.py | 815 +++++++++--------- python/samba/netcmd/domain_backup.py | 4 +- python/samba/netcmd/drs.py | 91 +-- python/samba/netcmd/dsacl.py | 57 +- python/samba/netcmd/forest.py | 23 +- python/samba/netcmd/fsmo.py | 59 +- python/samba/netcmd/gpo.py | 112 +-- python/samba/netcmd/group.py | 48 +- python/samba/netcmd/ldapcmp.py | 193 ++--- python/samba/netcmd/main.py | 3 +- python/samba/netcmd/nettime.py | 7 +- python/samba/netcmd/ntacl.py | 41 +- python/samba/netcmd/ou.py | 28 +- python/samba/netcmd/processes.py | 3 +- python/samba/netcmd/pso.py | 64 +- python/samba/netcmd/rodc.py | 7 +- python/samba/netcmd/schema.py | 50 +- python/samba/netcmd/sites.py | 5 +- python/samba/netcmd/spn.py | 36 +- python/samba/netcmd/testparm.py | 7 +- python/samba/netcmd/user.py | 180 ++-- python/samba/netcmd/visualize.py | 6 +- python/samba/ntacls.py | 22 +- python/samba/provision/__init__.py | 461 ++++++----- python/samba/provision/backend.py | 190 ++--- python/samba/provision/common.py | 4 +- python/samba/provision/kerberos.py | 1 + python/samba/provision/sambadns.py | 194 ++--- python/samba/remove_dc.py | 29 +- python/samba/samba3/__init__.py | 10 +- python/samba/samdb.py | 110 +-- python/samba/schema.py | 27 +- python/samba/sd_utils.py | 6 +- python/samba/sites.py | 2 +- python/samba/subnets.py | 3 + python/samba/subunit/__init__.py | 7 +- python/samba/tdb_util.py | 1 + python/samba/tests/__init__.py | 26 +- python/samba/tests/audit_log_dsdb.py | 1 - python/samba/tests/auth.py | 4 +- python/samba/tests/auth_log.py | 14 +- python/samba/tests/blackbox/check_output.py | 2 +- python/samba/tests/blackbox/ndrdump.py | 2 +- python/samba/tests/blackbox/samba_dnsupdate.py | 4 +- python/samba/tests/common.py | 7 +- python/samba/tests/core.py | 16 +- python/samba/tests/credentials.py | 65 +- python/samba/tests/dcerpc/__init__.py | 1 - python/samba/tests/dcerpc/array.py | 1 + python/samba/tests/dcerpc/bare.py | 25 +- python/samba/tests/dcerpc/dnsserver.py | 203 +++-- python/samba/tests/dcerpc/integer.py | 23 + python/samba/tests/dcerpc/raw_protocol.py | 610 +++++++------- python/samba/tests/dcerpc/raw_testcase.py | 78 +- python/samba/tests/dcerpc/registry.py | 8 +- python/samba/tests/dcerpc/rpcecho.py | 4 +- python/samba/tests/dcerpc/sam.py | 1 - python/samba/tests/dcerpc/srvsvc.py | 6 +- python/samba/tests/dcerpc/string.py | 1 - python/samba/tests/dcerpc/testrpc.py | 8 +- python/samba/tests/dcerpc/unix.py | 1 + python/samba/tests/dckeytab.py | 10 +- python/samba/tests/dns.py | 57 +- python/samba/tests/dns_forwarder.py | 6 +- python/samba/tests/dns_forwarder_helpers/server.py | 4 + python/samba/tests/dns_tkey.py | 1 + python/samba/tests/docs.py | 105 ++- python/samba/tests/dsdb.py | 11 +- python/samba/tests/dsdb_lock.py | 9 +- python/samba/tests/dsdb_schema_attributes.py | 6 +- python/samba/tests/gensec.py | 2 +- python/samba/tests/get_opt.py | 5 +- python/samba/tests/gpo.py | 27 +- python/samba/tests/graph.py | 50 +- python/samba/tests/hostconfig.py | 4 +- python/samba/tests/join.py | 5 +- python/samba/tests/kcc/__init__.py | 6 +- python/samba/tests/kcc/graph_utils.py | 2 +- python/samba/tests/kcc/ldif_import_export.py | 5 +- python/samba/tests/krb5_credentials.py | 2 +- python/samba/tests/libsmb_samba_internal.py | 2 + python/samba/tests/loadparm.py | 2 + python/samba/tests/lsa_string.py | 4 +- python/samba/tests/messaging.py | 3 + python/samba/tests/net_join.py | 1 + python/samba/tests/net_join_no_spnego.py | 1 + python/samba/tests/netbios.py | 10 +- python/samba/tests/netcmd.py | 9 +- python/samba/tests/netlogonsvc.py | 1 + python/samba/tests/ntacls_backup.py | 2 +- python/samba/tests/ntlmdisabled.py | 2 +- python/samba/tests/pam_winbind.py | 13 +- python/samba/tests/pam_winbind_warn_pwd_expire.py | 5 +- python/samba/tests/password_hash.py | 65 +- python/samba/tests/password_hash_fl2003.py | 4 +- python/samba/tests/password_hash_fl2008.py | 6 +- python/samba/tests/password_hash_gpgme.py | 9 +- python/samba/tests/password_hash_ldap.py | 3 +- python/samba/tests/password_quality.py | 1 + python/samba/tests/password_test.py | 2 +- python/samba/tests/policy.py | 4 +- python/samba/tests/posixacl.py | 103 ++- python/samba/tests/provision.py | 12 +- python/samba/tests/py_credentials.py | 18 +- python/samba/tests/s3idmapdb.py | 5 +- python/samba/tests/s3param.py | 2 +- python/samba/tests/s3passdb.py | 2 +- python/samba/tests/s3registry.py | 4 +- python/samba/tests/s3windb.py | 2 +- python/samba/tests/samba3sam.py | 217 ++--- python/samba/tests/samba_tool/base.py | 5 +- python/samba/tests/samba_tool/computer.py | 21 +- python/samba/tests/samba_tool/dnscmd.py | 128 +-- python/samba/tests/samba_tool/forest.py | 23 +- python/samba/tests/samba_tool/fsmo.py | 10 +- python/samba/tests/samba_tool/gpo.py | 2 + python/samba/tests/samba_tool/group.py | 23 +- python/samba/tests/samba_tool/join.py | 6 +- python/samba/tests/samba_tool/ntacl.py | 76 +- python/samba/tests/samba_tool/ou.py | 24 +- python/samba/tests/samba_tool/processes.py | 1 + .../tests/samba_tool/provision_password_check.py | 1 + python/samba/tests/samba_tool/rodc.py | 4 +- python/samba/tests/samba_tool/schema.py | 77 +- python/samba/tests/samba_tool/sites.py | 12 +- python/samba/tests/samba_tool/timecmd.py | 1 + python/samba/tests/samba_tool/user.py | 202 +++-- .../tests/samba_tool/user_check_password_script.py | 3 +- .../samba/tests/samba_tool/user_virtualCryptSHA.py | 17 +- python/samba/tests/samba_tool/user_wdigest.py | 9 +- python/samba/tests/samba_tool/visualize.py | 1 + python/samba/tests/samdb_api.py | 2 +- python/samba/tests/security.py | 13 +- python/samba/tests/smb.py | 34 +- python/samba/tests/source.py | 18 +- python/samba/tests/strings.py | 10 +- python/samba/tests/subunitrun.py | 6 +- python/samba/tests/upgrade.py | 2 +- python/samba/tests/upgradeprovision.py | 9 +- python/samba/tests/upgradeprovisionneeddc.py | 38 +- python/samba/tests/xattr.py | 27 +- python/samba/upgrade.py | 72 +- python/samba/upgradehelpers.py | 208 ++--- python/samba/web_server/__init__.py | 3 +- python/samba/xattr.py | 6 +- script/autobuild.py | 205 ++--- script/bisect-test.py | 14 +- script/compare_cc_results.py | 2 +- script/generate_param.py | 39 +- selftest/selftesthelpers.py | 12 +- selftest/subunithelper.py | 65 +- selftest/tests.py | 6 +- setup.cfg | 6 + source3/build/charset.py | 32 +- source3/script/tests/test_wbinfo_sids2xids_int.py | 26 +- source3/selftest/tests.py | 91 ++- source3/torture/test_ntlm_auth.py | 78 +- .../samdb/ldb_modules/tests/possibleinferiors.py | 30 +- source4/dsdb/tests/python/acl.py | 371 +++++---- .../dsdb/tests/python/ad_dc_medley_performance.py | 5 +- source4/dsdb/tests/python/ad_dc_multi_bind.py | 3 +- source4/dsdb/tests/python/ad_dc_performance.py | 6 +- .../tests/python/ad_dc_provision_performance.py | 1 + .../dsdb/tests/python/ad_dc_search_performance.py | 10 +- source4/dsdb/tests/python/deletetest.py | 76 +- source4/dsdb/tests/python/dirsync.py | 177 ++-- source4/dsdb/tests/python/dsdb_schema_info.py | 6 +- source4/dsdb/tests/python/ldap.py | 370 +++++---- source4/dsdb/tests/python/ldap_schema.py | 105 +-- source4/dsdb/tests/python/ldap_syntaxes.py | 75 +- source4/dsdb/tests/python/linked_attributes.py | 6 +- source4/dsdb/tests/python/login_basics.py | 1 + source4/dsdb/tests/python/ndr_pack_performance.py | 8 +- source4/dsdb/tests/python/notification.py | 4 +- source4/dsdb/tests/python/password_lockout.py | 157 ++-- source4/dsdb/tests/python/password_lockout_base.py | 75 +- source4/dsdb/tests/python/passwords.py | 68 +- source4/dsdb/tests/python/rodc.py | 2 +- source4/dsdb/tests/python/rodc_rwdc.py | 77 +- source4/dsdb/tests/python/sam.py | 680 +++++++-------- source4/dsdb/tests/python/sec_descriptor.py | 356 ++++---- source4/dsdb/tests/python/sites.py | 8 +- source4/dsdb/tests/python/sort.py | 6 +- source4/dsdb/tests/python/token_group.py | 47 +- source4/dsdb/tests/python/tombstone_reanimation.py | 12 +- source4/dsdb/tests/python/urgent_replication.py | 87 +- source4/dsdb/tests/python/user_account_control.py | 131 +-- source4/dsdb/tests/python/vlv.py | 37 +- source4/lib/wmi/wmi.py | 91 ++- source4/script/depfilter.py | 9 +- source4/scripting/devel/demodirsync.py | 22 +- source4/scripting/devel/pfm_verify.py | 11 +- source4/scripting/devel/repl_cleartext_pwd.py | 77 +- source4/scripting/devel/speedtest.py | 32 +- source4/selftest/tests.py | 150 ++-- source4/torture/drs/python/cracknames.py | 23 +- source4/torture/drs/python/delete_object.py | 12 +- source4/torture/drs/python/drs_base.py | 42 +- source4/torture/drs/python/fsmo.py | 12 +- source4/torture/drs/python/getnc_exop.py | 396 ++++----- source4/torture/drs/python/getnc_unpriv.py | 7 +- source4/torture/drs/python/link_conflicts.py | 20 +- .../torture/drs/python/linked_attributes_drs.py | 9 +- source4/torture/drs/python/repl_move.py | 41 +- source4/torture/drs/python/repl_rodc.py | 76 +- source4/torture/drs/python/repl_schema.py | 27 +- source4/torture/drs/python/replica_sync.py | 66 +- source4/torture/drs/python/replica_sync_rodc.py | 6 +- source4/torture/drs/python/ridalloc_exop.py | 34 +- source4/torture/drs/python/samba_tool_drs.py | 17 +- source4/torture/libnet/python/samr-test.py | 6 +- wintest/test-s3.py | 24 +- wintest/test-s4-howto.py | 135 +-- wintest/wintest.py | 89 +- 261 files changed, 6984 insertions(+), 6530 deletions(-) create mode 100644 setup.cfg Changeset truncated at 500 lines: diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py index 97122a9..7e47e80 100644 --- a/.ycm_extra_conf.py +++ b/.ycm_extra_conf.py @@ -252,6 +252,7 @@ else: SOURCE_EXTENSIONS = [ '.C', '.cpp', '.cxx', '.cc', '.c', '.m', '.mm' ] + def DirectoryOfThisScript(): return os.path.dirname( os.path.abspath( __file__ ) ) diff --git a/auth/credentials/tests/bind.py b/auth/credentials/tests/bind.py index e612dfc..7e0e19f 100755 --- a/auth/credentials/tests/bind.py +++ b/auth/credentials/tests/bind.py @@ -46,6 +46,7 @@ creds_user2 = copy.deepcopy(creds) creds_user3 = copy.deepcopy(creds) creds_user4 = copy.deepcopy(creds) + class BindTests(samba.tests.TestCase): info_dc = None @@ -111,8 +112,8 @@ unicodePwd:: """ + base64.b64encode(u"\"P@ssw0rd\"".encode('utf-16-le')).decode( # create user self.ldb.newuser(username=self.username, password=self.password) ldb_res = self.ldb.search(base=self.domain_dn, - scope=SCOPE_SUBTREE, - expression="(samAccountName=%s)" % self.username) + scope=SCOPE_SUBTREE, + expression="(samAccountName=%s)" % self.username) self.assertEquals(len(ldb_res), 1) user_dn = ldb_res[0]["dn"] self.addCleanup(delete_force, self.ldb, user_dn) @@ -145,8 +146,8 @@ unicodePwd:: """ + base64.b64encode(u"\"P@ssw0rd\"".encode('utf-16-le')).decode( # create user self.ldb.newuser(username=self.username, password=self.password) ldb_res = self.ldb.search(base=self.domain_dn, - scope=SCOPE_SUBTREE, - expression="(samAccountName=%s)" % self.username) + scope=SCOPE_SUBTREE, + expression="(samAccountName=%s)" % self.username) self.assertEquals(len(ldb_res), 1) user_dn = ldb_res[0]["dn"] self.addCleanup(delete_force, self.ldb, user_dn) @@ -158,10 +159,11 @@ unicodePwd:: """ + base64.b64encode(u"\"P@ssw0rd\"".encode('utf-16-le')).decode( print("BindTest (no domain) with: " + self.username) try: ldb_user4 = samba.tests.connect_samdb(host, credentials=creds_user4, - lp=lp, ldap_only=True) + lp=lp, ldap_only=True) except: self.fail("Failed to connect without the domain set") res = ldb_user4.search(base="", expression="", scope=SCOPE_BASE, attrs=["*"]) + TestProgram(module=__name__, opts=subunitopts) diff --git a/examples/logon/ntlogon/ntlogon.py b/examples/logon/ntlogon/ntlogon.py index ba46ba8..ff25c42 100755 --- a/examples/logon/ntlogon/ntlogon.py +++ b/examples/logon/ntlogon/ntlogon.py @@ -321,17 +321,16 @@ def run(): # # open the configuration file - # + # try: iFile = open(configfile, 'r') except IOError: print 'Unable to open configuration file: ' + configfile sys.exit(1) - # # open the output file - # + # if not debug: try: oFile = open(outdir + outfile, 'w') diff --git a/examples/scripts/vfs/media_harmony/trigger_avid_update.py b/examples/scripts/vfs/media_harmony/trigger_avid_update.py index 938b3d1..7d724ef 100755 --- a/examples/scripts/vfs/media_harmony/trigger_avid_update.py +++ b/examples/scripts/vfs/media_harmony/trigger_avid_update.py @@ -1,5 +1,8 @@ #!/usr/bin/python -import os, socket, sys, stat +import os +import socket +import sys +import stat ###################################################################### ## @@ -85,7 +88,7 @@ if __name__ == "__main__": newer_file = True if newer_file: - utime = None # Sets to current time. + utime = None # Sets to current time. print '...Setting fake mtime to NOW. Will trigger re-index.' else: mtime = os.stat(media_dir)[stat.ST_MTIME] diff --git a/lib/ldb-samba/tests/match_rules.py b/lib/ldb-samba/tests/match_rules.py index 31132e3..f36c9fb 100755 --- a/lib/ldb-samba/tests/match_rules.py +++ b/lib/ldb-samba/tests/match_rules.py @@ -22,6 +22,8 @@ from ldb import SCOPE_BASE, SCOPE_SUBTREE, SCOPE_ONELEVEL # This should be fixed to work inline with Windows. # The literal strings are in the case Windows uses. # Windows appear to preserve casing of the RDN and uppercase the other keys. + + class MatchRulesTests(samba.tests.TestCase): def setUp(self): super(MatchRulesTests, self).setUp() @@ -38,52 +40,52 @@ class MatchRulesTests(samba.tests.TestCase): "dn": self.ou, "objectclass": "organizationalUnit"}) - # Add the following OU hierarchy and set otherWellKnownObjects, - # which has BinaryDN syntax: - # - # o1 - # |--> o2 - # | |--> o3 - # | | |-->o4 + # Add the following OU hierarchy and set otherWellKnownObjects, + # which has BinaryDN syntax: + # + # o1 + # |--> o2 + # | |--> o3 + # | | |-->o4 - self.ldb.add({ - "dn": "OU=o1,%s" % self.ou, + self.ldb.add({ + "dn": "OU=o1,%s" % self.ou, "objectclass": "organizationalUnit"}) - self.ldb.add({ - "dn": "OU=o2,OU=o1,%s" % self.ou, + self.ldb.add({ + "dn": "OU=o2,OU=o1,%s" % self.ou, "objectclass": "organizationalUnit"}) - self.ldb.add({ - "dn": "OU=o3,OU=o2,OU=o1,%s" % self.ou, + self.ldb.add({ + "dn": "OU=o3,OU=o2,OU=o1,%s" % self.ou, "objectclass": "organizationalUnit"}) - self.ldb.add({ - "dn": "OU=o4,OU=o3,OU=o2,OU=o1,%s" % self.ou, + self.ldb.add({ + "dn": "OU=o4,OU=o3,OU=o2,OU=o1,%s" % self.ou, "objectclass": "organizationalUnit"}) m = Message() m.dn = Dn(self.ldb, self.ou) m["otherWellKnownObjects"] = MessageElement("B:32:00000000000000000000000000000001:OU=o1,%s" % self.ou, - FLAG_MOD_ADD, "otherWellKnownObjects") + FLAG_MOD_ADD, "otherWellKnownObjects") self.ldb.modify(m) m = Message() m.dn = Dn(self.ldb, "OU=o1,%s" % self.ou) m["otherWellKnownObjects"] = MessageElement("B:32:00000000000000000000000000000002:OU=o2,OU=o1,%s" % self.ou, - FLAG_MOD_ADD, "otherWellKnownObjects") + FLAG_MOD_ADD, "otherWellKnownObjects") self.ldb.modify(m) m = Message() m.dn = Dn(self.ldb, "OU=o2,OU=o1,%s" % self.ou) m["otherWellKnownObjects"] = MessageElement("B:32:00000000000000000000000000000003:OU=o3,OU=o2,OU=o1,%s" % self.ou, - FLAG_MOD_ADD, "otherWellKnownObjects") + FLAG_MOD_ADD, "otherWellKnownObjects") self.ldb.modify(m) m = Message() m.dn = Dn(self.ldb, "OU=o3,OU=o2,OU=o1,%s" % self.ou) m["otherWellKnownObjects"] = MessageElement("B:32:00000000000000000000000000000004:OU=o4,OU=o3,OU=o2,OU=o1,%s" % self.ou, - FLAG_MOD_ADD, "otherWellKnownObjects") + FLAG_MOD_ADD, "otherWellKnownObjects") self.ldb.modify(m) - # Create OU for users and groups + # Create OU for users and groups self.ldb.add({ "dn": self.ou_users, "objectclass": "organizationalUnit"}) @@ -97,16 +99,16 @@ class MatchRulesTests(samba.tests.TestCase): # Add four groups self.ldb.add({ "dn": "cn=g1,%s" % self.ou_groups, - "objectclass": "group" }) + "objectclass": "group"}) self.ldb.add({ "dn": "cn=g2,%s" % self.ou_groups, - "objectclass": "group" }) + "objectclass": "group"}) self.ldb.add({ "dn": "cn=g4,%s" % self.ou_groups, - "objectclass": "group" }) + "objectclass": "group"}) self.ldb.add({ "dn": "cn=g3,%s" % self.ou_groups, - "objectclass": "group" }) + "objectclass": "group"}) # Add four users self.ldb.add({ @@ -276,68 +278,68 @@ class MatchRulesTests(samba.tests.TestCase): def test_u1_member_of_g4(self): # Search without transitive match must return 0 results res1 = self.ldb.search("cn=g4,%s" % self.ou_groups, - scope=SCOPE_BASE, - expression="member=cn=u1,%s" % self.ou_users) + scope=SCOPE_BASE, + expression="member=cn=u1,%s" % self.ou_users) self.assertEqual(len(res1), 0) res1 = self.ldb.search("cn=u1,%s" % self.ou_users, - scope=SCOPE_BASE, - expression="memberOf=cn=g4,%s" % self.ou_groups) + scope=SCOPE_BASE, + expression="memberOf=cn=g4,%s" % self.ou_groups) self.assertEqual(len(res1), 0) # Search with transitive match must return 1 results res1 = self.ldb.search("cn=g4,%s" % self.ou_groups, - scope=SCOPE_BASE, - expression="member:1.2.840.113556.1.4.1941:=cn=u1,%s" % self.ou_users) + scope=SCOPE_BASE, + expression="member:1.2.840.113556.1.4.1941:=cn=u1,%s" % self.ou_users) self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("CN=g4,%s" % self.ou_groups).lower()) res1 = self.ldb.search("cn=u1,%s" % self.ou_users, - scope=SCOPE_BASE, - expression="memberOf:1.2.840.113556.1.4.1941:=cn=g4,%s" % self.ou_groups) + scope=SCOPE_BASE, + expression="memberOf:1.2.840.113556.1.4.1941:=cn=g4,%s" % self.ou_groups) self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("CN=u1,%s" % self.ou_users).lower()) def test_g1_member_of_g4(self): # Search without transitive match must return 0 results res1 = self.ldb.search("cn=g4,%s" % self.ou_groups, - scope=SCOPE_BASE, - expression="member=cn=g1,%s" % self.ou_groups) + scope=SCOPE_BASE, + expression="member=cn=g1,%s" % self.ou_groups) self.assertEqual(len(res1), 0) res1 = self.ldb.search("cn=g1,%s" % self.ou_groups, - scope=SCOPE_BASE, - expression="memberOf=cn=g4,%s" % self.ou_groups) + scope=SCOPE_BASE, + expression="memberOf=cn=g4,%s" % self.ou_groups) self.assertEqual(len(res1), 0) # Search with transitive match must return 1 results res1 = self.ldb.search("cn=g4,%s" % self.ou_groups, - scope=SCOPE_BASE, - expression="member:1.2.840.113556.1.4.1941:=cn=g1,%s" % self.ou_groups) + scope=SCOPE_BASE, + expression="member:1.2.840.113556.1.4.1941:=cn=g1,%s" % self.ou_groups) self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("CN=g4,%s" % self.ou_groups).lower()) res1 = self.ldb.search("cn=g1,%s" % self.ou_groups, - scope=SCOPE_BASE, - expression="memberOf:1.2.840.113556.1.4.1941:=cn=g4,%s" % self.ou_groups) + scope=SCOPE_BASE, + expression="memberOf:1.2.840.113556.1.4.1941:=cn=g4,%s" % self.ou_groups) self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("CN=g1,%s" % self.ou_groups).lower()) def test_u1_groups(self): res1 = self.ldb.search(self.ou_groups, - scope=SCOPE_SUBTREE, - expression="member=cn=u1,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member=cn=u1,%s" % self.ou_users) self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("CN=g1,%s" % self.ou_groups).lower()) res1 = self.ldb.search(self.ou_users, - scope=SCOPE_SUBTREE, - expression="member=cn=u1,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member=cn=u1,%s" % self.ou_users) self.assertEqual(len(res1), 0) res1 = self.ldb.search(self.ou_groups, - scope=SCOPE_SUBTREE, - expression="member:1.2.840.113556.1.4.1941:=cn=u1,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member:1.2.840.113556.1.4.1941:=cn=u1,%s" % self.ou_users) self.assertEqual(len(res1), 4) dn_list = [str(res.dn).lower() for res in res1] self.assertTrue(("CN=g1,%s" % self.ou_groups).lower() in dn_list) @@ -346,25 +348,25 @@ class MatchRulesTests(samba.tests.TestCase): self.assertTrue(("CN=g4,%s" % self.ou_groups).lower() in dn_list) res1 = self.ldb.search(self.ou_users, - scope=SCOPE_SUBTREE, - expression="member:1.2.840.113556.1.4.1941:=cn=u1,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member:1.2.840.113556.1.4.1941:=cn=u1,%s" % self.ou_users) self.assertEqual(len(res1), 0) def test_u2_groups(self): res1 = self.ldb.search(self.ou_groups, - scope=SCOPE_SUBTREE, - expression="member=cn=u2,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member=cn=u2,%s" % self.ou_users) self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("CN=g2,%s" % self.ou_groups).lower()) res1 = self.ldb.search(self.ou_users, - scope=SCOPE_SUBTREE, - expression="member=cn=u2,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member=cn=u2,%s" % self.ou_users) self.assertEqual(len(res1), 0) res1 = self.ldb.search(self.ou_groups, - scope=SCOPE_SUBTREE, - expression="member:1.2.840.113556.1.4.1941:=cn=u2,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member:1.2.840.113556.1.4.1941:=cn=u2,%s" % self.ou_users) self.assertEqual(len(res1), 3) dn_list = [str(res.dn).lower() for res in res1] self.assertTrue(("CN=g2,%s" % self.ou_groups).lower() in dn_list) @@ -372,63 +374,63 @@ class MatchRulesTests(samba.tests.TestCase): self.assertTrue(("CN=g4,%s" % self.ou_groups).lower() in dn_list) res1 = self.ldb.search(self.ou_users, - scope=SCOPE_SUBTREE, - expression="member:1.2.840.113556.1.4.1941:=cn=u2,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member:1.2.840.113556.1.4.1941:=cn=u2,%s" % self.ou_users) self.assertEqual(len(res1), 0) def test_u3_groups(self): res1 = self.ldb.search(self.ou_groups, - scope=SCOPE_SUBTREE, - expression="member=cn=u3,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member=cn=u3,%s" % self.ou_users) self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("CN=g3,%s" % self.ou_groups).lower()) res1 = self.ldb.search(self.ou_users, - scope=SCOPE_SUBTREE, - expression="member=cn=u3,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member=cn=u3,%s" % self.ou_users) self.assertEqual(len(res1), 0) res1 = self.ldb.search(self.ou_groups, - scope=SCOPE_SUBTREE, - expression="member:1.2.840.113556.1.4.1941:=cn=u3,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member:1.2.840.113556.1.4.1941:=cn=u3,%s" % self.ou_users) self.assertEqual(len(res1), 2) dn_list = [str(res.dn).lower() for res in res1] self.assertTrue(("CN=g3,%s" % self.ou_groups).lower() in dn_list) self.assertTrue(("CN=g4,%s" % self.ou_groups).lower() in dn_list) res1 = self.ldb.search(self.ou_users, - scope=SCOPE_SUBTREE, - expression="member:1.2.840.113556.1.4.1941:=cn=u3,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member:1.2.840.113556.1.4.1941:=cn=u3,%s" % self.ou_users) self.assertEqual(len(res1), 0) def test_u4_groups(self): res1 = self.ldb.search(self.ou_groups, - scope=SCOPE_SUBTREE, - expression="member=cn=u4,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member=cn=u4,%s" % self.ou_users) self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("CN=g4,%s" % self.ou_groups).lower()) res1 = self.ldb.search(self.ou_users, - scope=SCOPE_SUBTREE, - expression="member=cn=u4,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member=cn=u4,%s" % self.ou_users) self.assertEqual(len(res1), 0) res1 = self.ldb.search(self.ou_groups, - scope=SCOPE_SUBTREE, - expression="member:1.2.840.113556.1.4.1941:=cn=u4,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member:1.2.840.113556.1.4.1941:=cn=u4,%s" % self.ou_users) self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("CN=g4,%s" % self.ou_groups).lower()) res1 = self.ldb.search(self.ou_users, - scope=SCOPE_SUBTREE, - expression="member:1.2.840.113556.1.4.1941:=cn=u4,%s" % self.ou_users) + scope=SCOPE_SUBTREE, + expression="member:1.2.840.113556.1.4.1941:=cn=u4,%s" % self.ou_users) self.assertEqual(len(res1), 0) def test_extended_dn_u1(self): res1 = self.ldb.search("cn=u1,%s" % self.ou_users, - scope=SCOPE_BASE, - expression="objectClass=*", - attrs=['objectSid', 'objectGUID']) + scope=SCOPE_BASE, + expression="objectClass=*", + attrs=['objectSid', 'objectGUID']) self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("cn=u1,%s" % self.ou_users).lower()) @@ -436,20 +438,20 @@ class MatchRulesTests(samba.tests.TestCase): guid = self.ldb.schema_format_value("objectGUID", res1[0]['objectGUID'][0]) res1 = self.ldb.search(self.ou_groups, - scope=SCOPE_SUBTREE, - expression="member=<SID=%s>" % sid) + scope=SCOPE_SUBTREE, + expression="member=<SID=%s>" % sid) self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("CN=g1,%s" % self.ou_groups).lower()) res1 = self.ldb.search(self.ou_groups, - scope=SCOPE_SUBTREE, - expression="member=<GUID=%s>" % guid) + scope=SCOPE_SUBTREE, + expression="member=<GUID=%s>" % guid) self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("CN=g1,%s" % self.ou_groups).lower()) res1 = self.ldb.search(self.ou_groups, - scope=SCOPE_SUBTREE, - expression="member:1.2.840.113556.1.4.1941:=<SID=%s>" % sid) + scope=SCOPE_SUBTREE, + expression="member:1.2.840.113556.1.4.1941:=<SID=%s>" % sid) self.assertEqual(len(res1), 4) dn_list = [str(res.dn).lower() for res in res1] self.assertTrue(("CN=g1,%s" % self.ou_groups).lower() in dn_list) @@ -458,8 +460,8 @@ class MatchRulesTests(samba.tests.TestCase): self.assertTrue(("CN=g4,%s" % self.ou_groups).lower() in dn_list) res1 = self.ldb.search(self.ou_groups, - scope=SCOPE_ONELEVEL, - expression="member:1.2.840.113556.1.4.1941:=<SID=%s>" % sid) + scope=SCOPE_ONELEVEL, + expression="member:1.2.840.113556.1.4.1941:=<SID=%s>" % sid) self.assertEqual(len(res1), 4) dn_list = [str(res.dn).lower() for res in res1] self.assertTrue(("CN=g1,%s" % self.ou_groups).lower() in dn_list) @@ -468,8 +470,8 @@ class MatchRulesTests(samba.tests.TestCase): self.assertTrue(("CN=g4,%s" % self.ou_groups).lower() in dn_list) res1 = self.ldb.search(self.ou_groups, - scope=SCOPE_SUBTREE, - expression="member:1.2.840.113556.1.4.1941:=<GUID=%s>" % guid) + scope=SCOPE_SUBTREE, + expression="member:1.2.840.113556.1.4.1941:=<GUID=%s>" % guid) self.assertEqual(len(res1), 4) dn_list = [str(res.dn).lower() for res in res1] self.assertTrue(("CN=g1,%s" % self.ou_groups).lower() in dn_list) @@ -478,8 +480,8 @@ class MatchRulesTests(samba.tests.TestCase): self.assertTrue(("CN=g4,%s" % self.ou_groups).lower() in dn_list) res1 = self.ldb.search(self.ou_groups, - scope=SCOPE_ONELEVEL, - expression="member:1.2.840.113556.1.4.1941:=<GUID=%s>" % guid) + scope=SCOPE_ONELEVEL, + expression="member:1.2.840.113556.1.4.1941:=<GUID=%s>" % guid) self.assertEqual(len(res1), 4) dn_list = [str(res.dn).lower() for res in res1] self.assertTrue(("CN=g1,%s" % self.ou_groups).lower() in dn_list) @@ -489,9 +491,9 @@ class MatchRulesTests(samba.tests.TestCase): def test_extended_dn_u2(self): res1 = self.ldb.search("cn=u2,%s" % self.ou_users, - scope=SCOPE_BASE, - expression="objectClass=*", - attrs=['objectSid', 'objectGUID']) + scope=SCOPE_BASE, + expression="objectClass=*", + attrs=['objectSid', 'objectGUID']) self.assertEqual(len(res1), 1) self.assertEqual(str(res1[0].dn).lower(), ("cn=u2,%s" % self.ou_users).lower()) @@ -499,20 +501,20 @@ class MatchRulesTests(samba.tests.TestCase): guid = self.ldb.schema_format_value("objectGUID", res1[0]['objectGUID'][0]) res1 = self.ldb.search(self.ou_groups, -- Samba Shared Repository