[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Thu Mar 5 23:12:02 MST 2015
The branch, master has been updated
via 7004ccc Implement TestCase.assertIsNotNone for python < 2.7.
via a6b2110 Implement TestCase.assertIn for older versions of Python.
via d459096 Implement assertIsNone for Python < 2.7.
via 1988e11 Handle skips when running on python2.6.
via 02da1b3 Remove another call to addUnexpectedSuccess with too many arguments.
via b53a6df Run cleanup after tearDown, for consistency with Python >= 2.7.
via 5d4a938 TestCase.addUnexpectedSuccess doesn't take an error.
via 0acb1d4 Use samba TestCase so we get all compatibility functions on Python < 2.7.
via fe231be Provide TestCase.assertIsInstance for python < 2.7.
via cef4861 Use Samba TestCase class, as the python 2.6 one doesn't have assertIs, assertIsInstance or addCleanup.
via 9a4a7b9 Add replacement addCleanup.
via e3a9feb Add custom implementations of TestCase.assertIs and TestCase.assertIsNot, for Python2.6.
via 85c1dc9 Fix use of TestCase.skipTest on python2.6 now that we no longer use testtools.
via bd13405 Build python-ntdb bindings if ntdb was found but python-ntdb was not.
via b0cba79 Drop support for failfast mode, rather than adding support for it everywhere.
via 495e980 Fix use of iso8601.Utc.
via b2af53d Set failfast property for test reporters that need it.
via 2e2c05c Remove 'external' python module support code - use the third_party directory instead.
via 889d0ad Remove bundled but unused mimeparse.
via f1d7443 Remove unused bundled python-extras module.
via 8918481 Remove bundled testtools.
via da04eb9 Remove bundled subunit.
via e59f260 Remove unnecessary python path updates for bundled subunit/testtools.
via 850b393 Support using third party iso8601 module if system doesn't provide one.
via 13bd83a Bundle pyiso8601 for iso8601 time/date manipulation.
via 039fa93 Import UTC definition from utc8601 module.
via 8c6d85b subunithelper: Fix progress support.
via 940c277 Rename TestSkipped to Skiptest, consistent with Python 2.7.
via 7cb7d4b Avoid importing TestCase and TestSkipped from testtools.
via 80e387a Use iso8601 from the system, rather than the one bundled with subunit.
via 6363a2d format-subunit: Remove import of unnecessary third party modules testtools and subunit.
via 77e7024 filter-subunit: Remove import of unnecessary third party modules testtools and subunit.
via f52e895 tests/sam: Remove unnecessary calls for third party module imports.
via f980efee show_test_time: Use system subunit.
via 6ea461f test_samba3dump: Use Samba subunit emitter.
via ef2c6d0 test_duplicate_symbol: Use Samba subunit emitter.
via 8bbc343 Set default testRunner rather than requiring the user pass it in.
via cc4f537 Add basic tap2subunit converter, rather than relying on the one from subunit-tools.
via 1341e64 Inline outputting of subunit in libtorture.
via ee0b548 Fix handling of unexpected failures in subunithelper.
via 3f88e97 Use samba.subunit in selftest.subunithelper, except for iso8601.
via 8492285 Add RemoteTestCase and RemoteError to samba.subunit.
via ed65e04 Use samba.subunit in selftest/selftest.py.
via 8487f4a Use Samba-only subunit module in selftest/tests/.
via 9a1a344 Fix copyright headers for python/samba/subunit.
via de60dfd Use samba.subunit.run to run subunit tests.
via 4dae2d6 subunitrun: Update instructions for running subunit tests.
via 44a561f subunitrun: Use new samba.subunit.run module.
via 3f1ecfd selftest/tests/*.py: remove use of testtools.
via daf63fe Add simple subunit runner outputting subunit v1.
from f6efe0c ctdb-tests: Check for readable, not executable, script
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7004ccc441f700692b95dba89f8d3c4f30f2ca18
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Feb 5 22:04:44 2015 +0100
Implement TestCase.assertIsNotNone for python < 2.7.
Change-Id: Ieaefdc77495e27bad791075d985a70908e9be1ad
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Fri Mar 6 07:11:43 CET 2015 on sn-devel-104
commit a6b2110abd061b0e03d8b684e5a2edd12fbc1c64
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Feb 5 19:57:26 2015 +0100
Implement TestCase.assertIn for older versions of Python.
Change-Id: I17d855166b439c0bd9344a17a454ea5bc6e057aa
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit d459096e7c35f7bc7a83fd69cf0f70fc5ae4e15f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Feb 5 10:25:53 2015 +0100
Implement assertIsNone for Python < 2.7.
Change-Id: I3937acb16ca0c5430b70f0af305997878da53c37
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 1988e11585f8e928b2c52d2d97bf1269253b18d0
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Feb 4 16:40:29 2015 +0100
Handle skips when running on python2.6.
Change-Id: I8b0a15760a72f41800d23150232c2b0e59e32c32
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 02da1b379845799ecd4f1146b03674d2c59ce3d4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Feb 1 23:20:42 2015 +0100
Remove another call to addUnexpectedSuccess with too many arguments.
Change-Id: I5f1917e74ffd57b5ae228231c27fbdf70de2992f
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit b53a6df3d0587b7f865b425f66cee8361117b99f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Jan 30 02:16:05 2015 +0100
Run cleanup after tearDown, for consistency with Python >= 2.7.
Change-Id: Ic3ce975e3b2e4b30e07643efb4496ebf36a93284
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 5d4a938c068a5838136e6f8f30b8c594bc5016f1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Jan 30 02:07:17 2015 +0100
TestCase.addUnexpectedSuccess doesn't take an error.
Change-Id: I90f7dd225d9ed3cbc515292de9a37a816ac0639f
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 0acb1d49a78d6d63013ee9b7352e70cb8dd9b2c6
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Jan 30 02:06:33 2015 +0100
Use samba TestCase so we get all compatibility functions on Python < 2.7.
Change-Id: Iba87e3c8fa9331c4d5438ab60a8385379da634d7
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit fe231bedecace7e97da22add0cf48f1fd3772544
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Jan 28 23:17:13 2015 +0100
Provide TestCase.assertIsInstance for python < 2.7.
Change-Id: Id6d3c8a7dc56cb560eccc3db897a83c638dec7a6
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit cef4861906633be00cfb91a2d5e38f9870f749f4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Jan 28 22:17:41 2015 +0100
Use Samba TestCase class, as the python 2.6 one doesn't have assertIs, assertIsInstance or addCleanup.
Change-Id: I3daeffade0dac9795f61f91ee0da35fee0143a38
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 9a4a7b9d3e91439145e8a54c37da4a84754fe152
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jan 27 03:44:10 2015 +0100
Add replacement addCleanup.
Change-Id: Ie85756effde344fc4cc9b693c4a28611ea091677
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit e3a9feb6984136172616260293130095e19051e2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jan 27 03:40:34 2015 +0100
Add custom implementations of TestCase.assertIs and TestCase.assertIsNot, for Python2.6.
Change-Id: I3b806abdaf9540b7c39c961c179c2d2b15d327fe
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 85c1dc99083598339050ab5326ba9e0766eacdc8
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Dec 15 17:35:24 2014 +0000
Fix use of TestCase.skipTest on python2.6 now that we no longer use testtools.
Change-Id: I630e4073bf1553dfc77e9fe7e843ee8b71907683
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit bd13405e8570e9a5942165a8c52a2bc3fdc9d96e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Dec 15 17:33:49 2014 +0000
Build python-ntdb bindings if ntdb was found but python-ntdb was not.
Change-Id: I54c248effa63fe65e2bef0d41535d8eec0ef28c0
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit b0cba7950ae29bcb5cc38c21f0bf5637302deffa
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Dec 15 14:18:30 2014 +0000
Drop support for failfast mode, rather than adding support for it everywhere.
Change-Id: I4d6070a0e3b89d5e390f84754dddba9ec17ddf21
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 495e980fcd82bcaba8b4d341e699355533769ffe
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Dec 15 00:51:32 2014 +0000
Fix use of iso8601.Utc.
Change-Id: Id592571a173eff36e2fb9b395f61a6fb53d580e6
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit b2af53db74dcf6f4cfc9aa486ad3b0d14d64b5fd
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Dec 15 00:51:16 2014 +0000
Set failfast property for test reporters that need it.
Change-Id: Ibd632b9f569c23e60bcd13bcff805e367dd2e71c
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 2e2c05c1fef8183434e82debc87627acae5a5f97
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 20:31:45 2014 +0000
Remove 'external' python module support code - use the third_party directory instead.
Change-Id: I2f5053bc5a42d3dfe71f5bd027eb6ead7d1b9752
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 889d0adab1f303fccabd225e0162ca488ab26164
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 20:30:52 2014 +0000
Remove bundled but unused mimeparse.
Change-Id: I245607c0d27dbeae638f2f50c3b4d560eb9b70f8
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit f1d744364619f8d4a5b3609b97b53dfe6b18abb8
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 20:29:49 2014 +0000
Remove unused bundled python-extras module.
Change-Id: I6df0561ff4059c827d545d60a0865e17e9fefcf0
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 8918481a8415c76b83230067162a53935a4cce4a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 20:29:12 2014 +0000
Remove bundled testtools.
Change-Id: Ic6ddb352e403c9591cbe4ad3fd36758ffcc2ddb9
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit da04eb9c3aced4ec62c6cda54061a303d608c016
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 20:28:25 2014 +0000
Remove bundled subunit.
Change-Id: I18e19c3817de6f97fe2a9fb1b7faa4f8a0d27649
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit e59f2602f1f89f9d2a9b15a614ab0d86da5adc4e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 20:27:42 2014 +0000
Remove unnecessary python path updates for bundled subunit/testtools.
Change-Id: Idb40fcb564455f16608ea991b086e41e22ae51e3
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 850b3938e151707470044478a540d4573b25f72f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 20:27:03 2014 +0000
Support using third party iso8601 module if system doesn't provide one.
Change-Id: I5d035738d244d66d33788636c8ee8b322c227a0e
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 13bd83ad30ab083351084a3256bc9f06c8f34555
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 20:26:19 2014 +0000
Bundle pyiso8601 for iso8601 time/date manipulation.
(corrected lib/update-external.sh by Andrew Bartlett)
Change-Id: I0f992b949b1717635ff26fa0db6073675cce4ad7
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 039fa938b1cfed1f973b675648a2285c7b5d4ca0
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 20:17:03 2014 +0000
Import UTC definition from utc8601 module.
Change-Id: I3ccd81090c4721b161aff272100aa71bc2f17055
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 8c6d85b81781a85842c38be12ce431172594e159
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 20:10:20 2014 +0000
subunithelper: Fix progress support.
Change-Id: I5dd2ca0f3bc02821d5c9e1dc878bba577667d162
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 940c277d83737367617a7b06e49f71b6a2ab4fde
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 20:03:28 2014 +0000
Rename TestSkipped to Skiptest, consistent with Python 2.7.
Change-Id: I023df54363328333f1cb6c3ae3c1a406befa8f7b
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 7cb7d4b53eec0bea355a94388bfcce320b36ddfc
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 19:59:13 2014 +0000
Avoid importing TestCase and TestSkipped from testtools.
Change-Id: I34488ddf253decd336a67a8634e7039096bdd160
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 80e387adfac7a67ce91a87c656bfc5eded132c6d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 19:55:55 2014 +0000
Use iso8601 from the system, rather than the one bundled with subunit.
Change-Id: I681bf79eb9ebe45b6972b3783c8e799eb612400b
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 6363a2d8e90d525206aa83ad205a7a2263265bd1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 19:38:48 2014 +0000
format-subunit: Remove import of unnecessary third party modules testtools and subunit.
Change-Id: I3403ceacf8bbdf075c1c540081f7c3e82f4751bc
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 77e702460ea35cea6eebd061a04c570acc767f90
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 19:37:46 2014 +0000
filter-subunit: Remove import of unnecessary third party modules testtools and subunit.
Change-Id: I6ed0c560c18b4001c7adb9af6f67535640a1b374
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit f52e895459da5b1559d6e0d5cb3c7ad2fe2c6431
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 19:36:32 2014 +0000
tests/sam: Remove unnecessary calls for third party module imports.
Change-Id: Iaa1af59005eaee7ea79f3260b250a2c948e07532
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit f980efeef146ad71341efc8e205b7d4bd716bcb9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 19:34:14 2014 +0000
show_test_time: Use system subunit.
Change-Id: I7d799b5f9d6066d988aa2e101e0fe7b6efe74aea
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 6ea461fa056db3cd895d566a7ae8dc733dfbea5e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 19:32:23 2014 +0000
test_samba3dump: Use Samba subunit emitter.
Change-Id: Ie9a115d131624bfc68e6f40822acade70d145735
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit ef2c6d0d575eaac4c203045c244d1a38f29e502d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 19:31:48 2014 +0000
test_duplicate_symbol: Use Samba subunit emitter.
Change-Id: I280495706ff460674244183103306ca717c419a8
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 8bbc343b5c02a2a71b77e5b43cfe583b643a8910
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 19:25:55 2014 +0000
Set default testRunner rather than requiring the user pass it in.
Change-Id: I8b5a5925030049975a83b090e5c7b76d5245c07d
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit cc4f5372af80577cf7026438ebefc3ae8e5e030f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 14 19:25:12 2014 +0000
Add basic tap2subunit converter, rather than relying on the one from subunit-tools.
Change-Id: I39ec5ec68c7c3c9d329d8f1a8ce01445b85c7ab8
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 1341e6477277dd8f21f419aa79d9517bba4caf0c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Dec 13 22:11:06 2014 +0000
Inline outputting of subunit in libtorture.
Change-Id: I2c7045c530183a6961cb253540579312c2767330
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit ee0b548e9d84fb9cf206fcaa94c97ebd60225908
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Dec 13 21:37:51 2014 +0000
Fix handling of unexpected failures in subunithelper.
Change-Id: I0da9fcec4a54c43c171b76bb9015ea84389c9bc6
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 3f88e978a3513b177888d52d54cd947121854a17
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Dec 11 02:30:49 2014 +0000
Use samba.subunit in selftest.subunithelper, except for iso8601.
Change-Id: Iec43e0368db91dbe981b39ac8388b50c1eafee0c
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 84922852c338566be67aeddae5598c805679c1f7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Dec 11 02:26:54 2014 +0000
Add RemoteTestCase and RemoteError to samba.subunit.
Change-Id: Ib3946cf4eae69f53270a299660f6029290d3791a
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit ed65e04fa3942ce5c7dc1c3897e58e16da6691a8
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Dec 11 02:10:53 2014 +0000
Use samba.subunit in selftest/selftest.py.
Change-Id: I804c16cdfcfddc5643a5af158ee62c4ddf478979
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 8487f4afc1b514942f90b8f384b11f2cd66565fc
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Dec 11 01:55:16 2014 +0000
Use Samba-only subunit module in selftest/tests/.
Change-Id: I48c61f975c1fa49f6e244ad39dd720fe507db45b
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 9a1a34451f5c9fff702f43168e3d20df24acec41
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Dec 11 01:33:00 2014 +0000
Fix copyright headers for python/samba/subunit.
Change-Id: I5b554051f23f31d20b4f4325debcd6717ba8369e
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit de60dfd38967d64392c2a902473bd1966371a21a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Dec 11 01:16:38 2014 +0000
Use samba.subunit.run to run subunit tests.
Change-Id: Id9bdd33b7ac5e4db40ab8bef4dbe0f04c36d8da7
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 4dae2d6af8e5f8c415eb42655087fbd6ceb2d52c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Dec 11 01:14:08 2014 +0000
subunitrun: Update instructions for running subunit tests.
Change-Id: Icaf472198e93e283db2ae6ed99fd7ceae037af87
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 44a561fa455a98cd239b8c1dab196fe176ef39b5
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Dec 11 01:12:11 2014 +0000
subunitrun: Use new samba.subunit.run module.
Change-Id: I4a4d2237ec9ef090bf95a0ea57285610047451e5
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 3f1ecfd2d04b919cd488692ff4bcf02dcac60205
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Dec 11 01:11:41 2014 +0000
selftest/tests/*.py: remove use of testtools.
Change-Id: Ia692c6b3037b7d867310c3793980f9f953d31680
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit daf63fef10835a5c5a7b51a78fbd45911a48e58e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Dec 11 01:07:36 2014 +0000
Add simple subunit runner outputting subunit v1.
This is a short module (< 1k lines) that removes the need to
depend on subunit, testtools, extras and mimeparse. It is
based on an extract from testtools and subunit.
Change-Id: I0a4f3060b25f7bde602a07ed6bef71c8196fca64
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/test_duplicate_symbol.sh | 2 +-
lib/extras/.gitignore | 35 -
lib/extras/.testr.conf | 4 -
lib/extras/LICENSE | 26 -
lib/extras/MANIFEST.in | 6 -
lib/extras/Makefile | 30 -
lib/extras/NEWS | 27 -
lib/extras/README.rst | 57 -
lib/extras/extras/__init__.py | 103 -
lib/extras/extras/tests/__init__.py | 17 -
lib/extras/extras/tests/test_extras.py | 186 --
lib/extras/setup.cfg | 4 -
lib/extras/setup.py | 48 -
lib/mimeparse/__init__.py | 0
lib/mimeparse/mimeparse.py | 167 --
lib/mimeparse/mimeparse_test.py | 68 -
lib/mimeparse/setup.py | 50 -
lib/ntdb/wscript | 14 +-
lib/subunit/Apache-2.0 | 202 --
lib/subunit/BSD | 26 -
lib/subunit/COPYING | 36 -
lib/subunit/INSTALL | 32 -
lib/subunit/MANIFEST.in | 20 -
lib/subunit/Makefile.am | 141 --
lib/subunit/NEWS | 344 ----
lib/subunit/README | 229 ---
lib/subunit/c++/README | 50 -
lib/subunit/c++/SubunitTestProgressListener.cpp | 63 -
lib/subunit/c++/SubunitTestProgressListener.h | 56 -
lib/subunit/c/README | 68 -
lib/subunit/c/include/subunit/child.h | 96 -
lib/subunit/c/lib/child.c | 104 -
lib/subunit/c/tests/test_child.c | 234 ---
lib/subunit/c/wscript | 16 -
lib/subunit/configure.ac | 75 -
lib/subunit/filters/subunit-filter | 158 --
lib/subunit/filters/subunit-ls | 48 -
lib/subunit/filters/subunit-notify | 44 -
lib/subunit/filters/subunit-stats | 41 -
lib/subunit/filters/subunit-tags | 26 -
lib/subunit/filters/subunit2csv | 23 -
lib/subunit/filters/subunit2gtk | 259 ---
lib/subunit/filters/subunit2junitxml | 31 -
lib/subunit/filters/subunit2pyunit | 48 -
lib/subunit/filters/tap2subunit | 26 -
lib/subunit/libcppunit_subunit.pc.in | 11 -
lib/subunit/libsubunit.pc.in | 11 -
lib/subunit/perl/Makefile.PL.in | 21 -
lib/subunit/perl/lib/Subunit.pm | 183 --
lib/subunit/perl/lib/Subunit/Diff.pm | 85 -
lib/subunit/perl/subunit-diff | 31 -
lib/subunit/python/iso8601/README | 26 -
lib/subunit/python/iso8601/README.subunit | 5 -
lib/subunit/python/iso8601/setup.py | 58 -
lib/subunit/python/iso8601/test_iso8601.py | 111 --
lib/subunit/python/subunit/__init__.py | 1314 ------------
lib/subunit/python/subunit/chunked.py | 185 --
lib/subunit/python/subunit/details.py | 119 --
lib/subunit/python/subunit/filters.py | 125 --
lib/subunit/python/subunit/iso8601.py | 133 --
lib/subunit/python/subunit/progress_model.py | 106 -
lib/subunit/python/subunit/run.py | 84 -
lib/subunit/python/subunit/test_results.py | 678 -------
lib/subunit/python/subunit/tests/TestUtil.py | 80 -
lib/subunit/python/subunit/tests/__init__.py | 43 -
lib/subunit/python/subunit/tests/sample-script.py | 21 -
.../python/subunit/tests/sample-two-script.py | 7 -
lib/subunit/python/subunit/tests/test_chunked.py | 152 --
lib/subunit/python/subunit/tests/test_details.py | 112 --
.../python/subunit/tests/test_progress_model.py | 118 --
lib/subunit/python/subunit/tests/test_run.py | 52 -
.../python/subunit/tests/test_subunit_filter.py | 370 ----
.../python/subunit/tests/test_subunit_stats.py | 84 -
.../python/subunit/tests/test_subunit_tags.py | 69 -
.../python/subunit/tests/test_tap2subunit.py | 445 -----
.../python/subunit/tests/test_test_protocol.py | 1337 -------------
.../python/subunit/tests/test_test_results.py | 572 ------
lib/subunit/runtests.py | 138 --
lib/subunit/setup.py | 63 -
lib/subunit/shell/README | 62 -
lib/subunit/shell/share/subunit.sh | 61 -
lib/subunit/shell/tests/test_function_output.sh | 97 -
lib/subunit/shell/tests/test_source_library.sh | 108 -
lib/testtools/.testr.conf | 4 -
lib/testtools/LICENSE | 58 -
lib/testtools/MANIFEST.in | 10 -
lib/testtools/Makefile | 56 -
lib/testtools/NEWS | 1413 -------------
lib/testtools/README | 89 -
lib/testtools/doc/Makefile | 89 -
lib/testtools/doc/_static/placeholder.txt | 0
lib/testtools/doc/_templates/placeholder.txt | 0
lib/testtools/doc/for-framework-folk.rst | 238 ---
lib/testtools/doc/for-test-authors.rst | 1360 -------------
lib/testtools/doc/hacking.rst | 153 --
lib/testtools/doc/index.rst | 36 -
lib/testtools/doc/make.bat | 113 --
lib/testtools/doc/overview.rst | 102 -
lib/testtools/scripts/README | 3 -
lib/testtools/scripts/_lp_release.py | 230 ---
lib/testtools/scripts/all-pythons | 93 -
lib/testtools/scripts/update-rtfd | 11 -
lib/testtools/setup.cfg | 4 -
lib/testtools/setup.py | 85 -
lib/testtools/testtools/__init__.py | 89 -
lib/testtools/testtools/_compat2x.py | 17 -
lib/testtools/testtools/_compat3x.py | 17 -
lib/testtools/testtools/_spinner.py | 316 ---
lib/testtools/testtools/compat.py | 393 ----
lib/testtools/testtools/content.py | 324 ---
lib/testtools/testtools/content_type.py | 41 -
lib/testtools/testtools/deferredruntest.py | 336 ----
lib/testtools/testtools/distutilscmd.py | 62 -
lib/testtools/testtools/helpers.py | 119 --
lib/testtools/testtools/matchers/__init__.py | 113 --
lib/testtools/testtools/matchers/_basic.py | 315 ---
.../testtools/matchers/_datastructures.py | 228 ---
lib/testtools/testtools/matchers/_dict.py | 259 ---
lib/testtools/testtools/matchers/_doctest.py | 104 -
lib/testtools/testtools/matchers/_exception.py | 124 --
lib/testtools/testtools/matchers/_filesystem.py | 192 --
lib/testtools/testtools/matchers/_higherorder.py | 289 ---
lib/testtools/testtools/matchers/_impl.py | 175 --
lib/testtools/testtools/monkey.py | 97 -
lib/testtools/testtools/run.py | 351 ----
lib/testtools/testtools/runtest.py | 205 --
lib/testtools/testtools/tags.py | 34 -
lib/testtools/testtools/testcase.py | 798 --------
lib/testtools/testtools/testresult/__init__.py | 25 -
lib/testtools/testtools/testresult/doubles.py | 150 --
lib/testtools/testtools/testresult/real.py | 981 ---------
lib/testtools/testtools/tests/__init__.py | 46 -
lib/testtools/testtools/tests/helpers.py | 109 -
lib/testtools/testtools/tests/matchers/__init__.py | 29 -
lib/testtools/testtools/tests/matchers/helpers.py | 42 -
.../testtools/tests/matchers/test_basic.py | 374 ----
.../tests/matchers/test_datastructures.py | 209 --
.../testtools/tests/matchers/test_dict.py | 222 ---
.../testtools/tests/matchers/test_doctest.py | 82 -
.../testtools/tests/matchers/test_exception.py | 192 --
.../testtools/tests/matchers/test_filesystem.py | 243 ---
.../testtools/tests/matchers/test_higherorder.py | 227 ---
.../testtools/tests/matchers/test_impl.py | 132 --
lib/testtools/testtools/tests/test_compat.py | 432 ----
lib/testtools/testtools/tests/test_content.py | 277 ---
lib/testtools/testtools/tests/test_content_type.py | 66 -
.../testtools/tests/test_deferredruntest.py | 766 -------
lib/testtools/testtools/tests/test_distutilscmd.py | 99 -
.../testtools/tests/test_fixturesupport.py | 117 --
lib/testtools/testtools/tests/test_helpers.py | 213 --
lib/testtools/testtools/tests/test_monkey.py | 167 --
lib/testtools/testtools/tests/test_run.py | 120 --
lib/testtools/testtools/tests/test_runtest.py | 303 ---
lib/testtools/testtools/tests/test_spinner.py | 332 ----
lib/testtools/testtools/tests/test_tags.py | 84 -
lib/testtools/testtools/tests/test_testcase.py | 1335 -------------
lib/testtools/testtools/tests/test_testresult.py | 2095 --------------------
lib/testtools/testtools/tests/test_testsuite.py | 128 --
lib/testtools/testtools/tests/test_with_with.py | 73 -
lib/testtools/testtools/testsuite.py | 154 --
lib/testtools/testtools/utils.py | 13 -
lib/torture/subunit.c | 29 +-
lib/torture/wscript_build | 2 +-
lib/update-external.sh | 30 +-
lib/wscript_build | 28 -
python/samba/__init__.py | 16 -
python/samba/subunit/__init__.py | 89 +
python/samba/subunit/run.py | 703 +++++++
python/samba/tests/__init__.py | 106 +-
python/samba/tests/dcerpc/srvsvc.py | 6 +-
python/samba/tests/docs.py | 3 +-
python/samba/tests/ntacls.py | 7 +-
python/samba/tests/source.py | 4 +
python/samba/tests/subunitrun.py | 12 +-
python/samba/tests/xattr.py | 10 +-
script/show_test_time | 9 +-
selftest/filter-subunit | 5 -
selftest/format-subunit | 7 +-
selftest/run.py | 4 +-
selftest/selftest.py | 2 +-
selftest/selftesthelpers.py | 43 +-
selftest/subunithelper.py | 91 +-
selftest/tap2subunit | 128 ++
selftest/tests/__init__.py | 2 -
selftest/tests/test_run.py | 19 +-
selftest/tests/test_samba.py | 2 +-
selftest/tests/test_socket_wrapper.py | 2 +-
selftest/tests/test_target.py | 2 +-
selftest/tests/test_testlist.py | 2 +-
source4/dsdb/tests/python/sam.py | 2 -
source4/scripting/bin/subunitrun | 2 +-
source4/selftest/test_samba3dump.sh | 2 +-
source4/selftest/tests.py | 5 +-
third_party/pyiso8601/.hgignore | 8 +
third_party/pyiso8601/.hgtags | 6 +
.../iso8601 => third_party/pyiso8601}/LICENSE | 2 +-
third_party/pyiso8601/MANIFEST.in | 2 +
third_party/pyiso8601/README.rst | 180 ++
third_party/pyiso8601/dev-requirements.txt | 5 +
third_party/pyiso8601/docs/Makefile | 177 ++
.../doc => third_party/pyiso8601/docs}/conf.py | 148 +-
third_party/pyiso8601/docs/index.rst | 80 +
third_party/pyiso8601/docs/make.bat | 242 +++
third_party/pyiso8601/iso8601/__init__.py | 1 +
third_party/pyiso8601/iso8601/iso8601.py | 214 ++
third_party/pyiso8601/iso8601/test_iso8601.py | 97 +
third_party/pyiso8601/setup.py | 25 +
third_party/pyiso8601/tox.ini | 8 +
third_party/wscript_build | 1 +
wscript | 1 -
wscript_build | 1 -
211 files changed, 2301 insertions(+), 29870 deletions(-)
delete mode 100644 lib/extras/.gitignore
delete mode 100644 lib/extras/.testr.conf
delete mode 100644 lib/extras/LICENSE
delete mode 100644 lib/extras/MANIFEST.in
delete mode 100644 lib/extras/Makefile
delete mode 100644 lib/extras/NEWS
delete mode 100644 lib/extras/README.rst
delete mode 100644 lib/extras/extras/__init__.py
delete mode 100644 lib/extras/extras/tests/__init__.py
delete mode 100644 lib/extras/extras/tests/test_extras.py
delete mode 100644 lib/extras/setup.cfg
delete mode 100755 lib/extras/setup.py
delete mode 100644 lib/mimeparse/__init__.py
delete mode 100644 lib/mimeparse/mimeparse.py
delete mode 100644 lib/mimeparse/mimeparse_test.py
delete mode 100644 lib/mimeparse/setup.py
delete mode 100644 lib/subunit/Apache-2.0
delete mode 100644 lib/subunit/BSD
delete mode 100644 lib/subunit/COPYING
delete mode 100644 lib/subunit/INSTALL
delete mode 100644 lib/subunit/MANIFEST.in
delete mode 100644 lib/subunit/Makefile.am
delete mode 100644 lib/subunit/NEWS
delete mode 100644 lib/subunit/README
delete mode 100644 lib/subunit/c++/README
delete mode 100644 lib/subunit/c++/SubunitTestProgressListener.cpp
delete mode 100644 lib/subunit/c++/SubunitTestProgressListener.h
delete mode 100644 lib/subunit/c/README
delete mode 100644 lib/subunit/c/include/subunit/child.h
delete mode 100644 lib/subunit/c/lib/child.c
delete mode 100644 lib/subunit/c/tests/test_child.c
delete mode 100644 lib/subunit/c/wscript
delete mode 100644 lib/subunit/configure.ac
delete mode 100755 lib/subunit/filters/subunit-filter
delete mode 100755 lib/subunit/filters/subunit-ls
delete mode 100755 lib/subunit/filters/subunit-notify
delete mode 100755 lib/subunit/filters/subunit-stats
delete mode 100755 lib/subunit/filters/subunit-tags
delete mode 100755 lib/subunit/filters/subunit2csv
delete mode 100755 lib/subunit/filters/subunit2gtk
delete mode 100755 lib/subunit/filters/subunit2junitxml
delete mode 100755 lib/subunit/filters/subunit2pyunit
delete mode 100755 lib/subunit/filters/tap2subunit
delete mode 100644 lib/subunit/libcppunit_subunit.pc.in
delete mode 100644 lib/subunit/libsubunit.pc.in
delete mode 100755 lib/subunit/perl/Makefile.PL.in
delete mode 100644 lib/subunit/perl/lib/Subunit.pm
delete mode 100644 lib/subunit/perl/lib/Subunit/Diff.pm
delete mode 100755 lib/subunit/perl/subunit-diff
delete mode 100644 lib/subunit/python/iso8601/README
delete mode 100644 lib/subunit/python/iso8601/README.subunit
delete mode 100644 lib/subunit/python/iso8601/setup.py
delete mode 100644 lib/subunit/python/iso8601/test_iso8601.py
delete mode 100644 lib/subunit/python/subunit/__init__.py
delete mode 100644 lib/subunit/python/subunit/chunked.py
delete mode 100644 lib/subunit/python/subunit/details.py
delete mode 100644 lib/subunit/python/subunit/filters.py
delete mode 100644 lib/subunit/python/subunit/iso8601.py
delete mode 100644 lib/subunit/python/subunit/progress_model.py
delete mode 100755 lib/subunit/python/subunit/run.py
delete mode 100644 lib/subunit/python/subunit/test_results.py
delete mode 100644 lib/subunit/python/subunit/tests/TestUtil.py
delete mode 100644 lib/subunit/python/subunit/tests/__init__.py
delete mode 100755 lib/subunit/python/subunit/tests/sample-script.py
delete mode 100755 lib/subunit/python/subunit/tests/sample-two-script.py
delete mode 100644 lib/subunit/python/subunit/tests/test_chunked.py
delete mode 100644 lib/subunit/python/subunit/tests/test_details.py
delete mode 100644 lib/subunit/python/subunit/tests/test_progress_model.py
delete mode 100644 lib/subunit/python/subunit/tests/test_run.py
delete mode 100644 lib/subunit/python/subunit/tests/test_subunit_filter.py
delete mode 100644 lib/subunit/python/subunit/tests/test_subunit_stats.py
delete mode 100644 lib/subunit/python/subunit/tests/test_subunit_tags.py
delete mode 100644 lib/subunit/python/subunit/tests/test_tap2subunit.py
delete mode 100644 lib/subunit/python/subunit/tests/test_test_protocol.py
delete mode 100644 lib/subunit/python/subunit/tests/test_test_results.py
delete mode 100755 lib/subunit/runtests.py
delete mode 100755 lib/subunit/setup.py
delete mode 100644 lib/subunit/shell/README
delete mode 100644 lib/subunit/shell/share/subunit.sh
delete mode 100755 lib/subunit/shell/tests/test_function_output.sh
delete mode 100755 lib/subunit/shell/tests/test_source_library.sh
delete mode 100644 lib/testtools/.testr.conf
delete mode 100644 lib/testtools/LICENSE
delete mode 100644 lib/testtools/MANIFEST.in
delete mode 100644 lib/testtools/Makefile
delete mode 100644 lib/testtools/NEWS
delete mode 100644 lib/testtools/README
delete mode 100644 lib/testtools/doc/Makefile
delete mode 100644 lib/testtools/doc/_static/placeholder.txt
delete mode 100644 lib/testtools/doc/_templates/placeholder.txt
delete mode 100644 lib/testtools/doc/for-framework-folk.rst
delete mode 100644 lib/testtools/doc/for-test-authors.rst
delete mode 100644 lib/testtools/doc/hacking.rst
delete mode 100644 lib/testtools/doc/index.rst
delete mode 100644 lib/testtools/doc/make.bat
delete mode 100644 lib/testtools/doc/overview.rst
delete mode 100644 lib/testtools/scripts/README
delete mode 100644 lib/testtools/scripts/_lp_release.py
delete mode 100755 lib/testtools/scripts/all-pythons
delete mode 100755 lib/testtools/scripts/update-rtfd
delete mode 100644 lib/testtools/setup.cfg
delete mode 100755 lib/testtools/setup.py
delete mode 100644 lib/testtools/testtools/__init__.py
delete mode 100644 lib/testtools/testtools/_compat2x.py
delete mode 100644 lib/testtools/testtools/_compat3x.py
delete mode 100644 lib/testtools/testtools/_spinner.py
delete mode 100644 lib/testtools/testtools/compat.py
delete mode 100644 lib/testtools/testtools/content.py
delete mode 100644 lib/testtools/testtools/content_type.py
delete mode 100644 lib/testtools/testtools/deferredruntest.py
delete mode 100644 lib/testtools/testtools/distutilscmd.py
delete mode 100644 lib/testtools/testtools/helpers.py
delete mode 100644 lib/testtools/testtools/matchers/__init__.py
delete mode 100644 lib/testtools/testtools/matchers/_basic.py
delete mode 100644 lib/testtools/testtools/matchers/_datastructures.py
delete mode 100644 lib/testtools/testtools/matchers/_dict.py
delete mode 100644 lib/testtools/testtools/matchers/_doctest.py
delete mode 100644 lib/testtools/testtools/matchers/_exception.py
delete mode 100644 lib/testtools/testtools/matchers/_filesystem.py
delete mode 100644 lib/testtools/testtools/matchers/_higherorder.py
delete mode 100644 lib/testtools/testtools/matchers/_impl.py
delete mode 100644 lib/testtools/testtools/monkey.py
delete mode 100755 lib/testtools/testtools/run.py
delete mode 100644 lib/testtools/testtools/runtest.py
delete mode 100644 lib/testtools/testtools/tags.py
delete mode 100644 lib/testtools/testtools/testcase.py
delete mode 100644 lib/testtools/testtools/testresult/__init__.py
delete mode 100644 lib/testtools/testtools/testresult/doubles.py
delete mode 100644 lib/testtools/testtools/testresult/real.py
delete mode 100644 lib/testtools/testtools/tests/__init__.py
delete mode 100644 lib/testtools/testtools/tests/helpers.py
delete mode 100644 lib/testtools/testtools/tests/matchers/__init__.py
delete mode 100644 lib/testtools/testtools/tests/matchers/helpers.py
delete mode 100644 lib/testtools/testtools/tests/matchers/test_basic.py
delete mode 100644 lib/testtools/testtools/tests/matchers/test_datastructures.py
delete mode 100644 lib/testtools/testtools/tests/matchers/test_dict.py
delete mode 100644 lib/testtools/testtools/tests/matchers/test_doctest.py
delete mode 100644 lib/testtools/testtools/tests/matchers/test_exception.py
delete mode 100644 lib/testtools/testtools/tests/matchers/test_filesystem.py
delete mode 100644 lib/testtools/testtools/tests/matchers/test_higherorder.py
delete mode 100644 lib/testtools/testtools/tests/matchers/test_impl.py
delete mode 100644 lib/testtools/testtools/tests/test_compat.py
delete mode 100644 lib/testtools/testtools/tests/test_content.py
delete mode 100644 lib/testtools/testtools/tests/test_content_type.py
delete mode 100644 lib/testtools/testtools/tests/test_deferredruntest.py
delete mode 100644 lib/testtools/testtools/tests/test_distutilscmd.py
delete mode 100644 lib/testtools/testtools/tests/test_fixturesupport.py
delete mode 100644 lib/testtools/testtools/tests/test_helpers.py
delete mode 100644 lib/testtools/testtools/tests/test_monkey.py
delete mode 100644 lib/testtools/testtools/tests/test_run.py
delete mode 100644 lib/testtools/testtools/tests/test_runtest.py
delete mode 100644 lib/testtools/testtools/tests/test_spinner.py
delete mode 100644 lib/testtools/testtools/tests/test_tags.py
delete mode 100644 lib/testtools/testtools/tests/test_testcase.py
delete mode 100644 lib/testtools/testtools/tests/test_testresult.py
delete mode 100644 lib/testtools/testtools/tests/test_testsuite.py
delete mode 100644 lib/testtools/testtools/tests/test_with_with.py
delete mode 100644 lib/testtools/testtools/testsuite.py
delete mode 100644 lib/testtools/testtools/utils.py
create mode 100644 python/samba/subunit/__init__.py
create mode 100755 python/samba/subunit/run.py
create mode 100755 selftest/tap2subunit
create mode 100644 third_party/pyiso8601/.hgignore
create mode 100644 third_party/pyiso8601/.hgtags
rename {lib/subunit/python/iso8601 => third_party/pyiso8601}/LICENSE (96%)
create mode 100644 third_party/pyiso8601/MANIFEST.in
create mode 100644 third_party/pyiso8601/README.rst
create mode 100644 third_party/pyiso8601/dev-requirements.txt
create mode 100644 third_party/pyiso8601/docs/Makefile
rename {lib/testtools/doc => third_party/pyiso8601/docs}/conf.py (60%)
create mode 100644 third_party/pyiso8601/docs/index.rst
create mode 100644 third_party/pyiso8601/docs/make.bat
create mode 100644 third_party/pyiso8601/iso8601/__init__.py
create mode 100644 third_party/pyiso8601/iso8601/iso8601.py
create mode 100644 third_party/pyiso8601/iso8601/test_iso8601.py
create mode 100644 third_party/pyiso8601/setup.py
create mode 100644 third_party/pyiso8601/tox.ini
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/test_duplicate_symbol.sh b/buildtools/wafsamba/test_duplicate_symbol.sh
index 712c7e6..89a4027 100755
--- a/buildtools/wafsamba/test_duplicate_symbol.sh
+++ b/buildtools/wafsamba/test_duplicate_symbol.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Run the waf duplicate symbol check, wrapped in subunit.
-. lib/subunit/shell/share/subunit.sh
+. testprogs/blackbox/subunit.sh
subunit_start_test duplicate_symbols
diff --git a/lib/extras/.gitignore b/lib/extras/.gitignore
deleted file mode 100644
index cfc114c..0000000
--- a/lib/extras/.gitignore
+++ /dev/null
@@ -1,35 +0,0 @@
-*.py[co]
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-MANIFEST
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
-
-#Mr Developer
-.mr.developer.cfg
-
-# editors
-*.swp
-*~
-
-# Testrepository
-.testrepository
diff --git a/lib/extras/.testr.conf b/lib/extras/.testr.conf
deleted file mode 100644
index 8a65628..0000000
--- a/lib/extras/.testr.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-test_command=${PYTHON:-python} -m subunit.run discover . $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/lib/extras/LICENSE b/lib/extras/LICENSE
deleted file mode 100644
index 4dfca45..0000000
--- a/lib/extras/LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2010-2012 the extras authors.
-
-The extras authors are:
- * Jonathan Lange
- * Martin Pool
- * Robert Collins
-
-and are collectively referred to as "extras developers".
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/lib/extras/MANIFEST.in b/lib/extras/MANIFEST.in
deleted file mode 100644
index da2696e..0000000
--- a/lib/extras/MANIFEST.in
+++ /dev/null
@@ -1,6 +0,0 @@
-include LICENSE
-include Makefile
-include MANIFEST.in
-include NEWS
-include README.rst
-include .gitignore
diff --git a/lib/extras/Makefile b/lib/extras/Makefile
deleted file mode 100644
index 270e8d1..0000000
--- a/lib/extras/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# See README.rst for copyright and licensing details.
-
-PYTHON=python
-SOURCES=$(shell find extras -name "*.py")
-
-check:
- PYTHONPATH=$(PWD) $(PYTHON) -m testtools.run extras.tests.test_suite
-
-TAGS: ${SOURCES}
- ctags -e -R extras/
-
-tags: ${SOURCES}
- ctags -R extras/
-
-clean:
- rm -f TAGS tags
- find extras -name "*.pyc" -exec rm '{}' \;
-
-### Documentation ###
-
-apidocs:
- # pydoctor emits deprecation warnings under Ubuntu 10.10 LTS
- PYTHONWARNINGS='ignore::DeprecationWarning' \
- pydoctor --make-html --add-package extras \
- --docformat=restructuredtext --project-name=extras \
- --project-url=https://launchpad.net/extras
-
-
-.PHONY: apidocs
-.PHONY: check clean
diff --git a/lib/extras/NEWS b/lib/extras/NEWS
deleted file mode 100644
index 60713b8..0000000
--- a/lib/extras/NEWS
+++ /dev/null
@@ -1,27 +0,0 @@
-extras NEWS
-+++++++++++
-
-Changes and improvements to extras_, grouped by release.
-
-NEXT
-~~~~
-
-0.0.3
-~~~~~
-
-* Extras setup.py would break on older testtools releases, which could break
- installs of newer testtools due to extras then failing to install.
- (Robert Collins)
-
-0.0.2
-~~~~~
-
-* Fix Makefile to not have cruft leftover from testtools.
-
-0.0.1
-~~~~~
-
-* Initial extraction from testtools.
-
-
-.. _extras: http://pypi.python.org/pypi/extras
diff --git a/lib/extras/README.rst b/lib/extras/README.rst
deleted file mode 100644
index 7d3f10b..0000000
--- a/lib/extras/README.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-======
-extras
-======
-
-extras is a set of extensions to the Python standard library, originally
-written to make the code within testtools cleaner, but now split out for
-general use outside of a testing context.
-
-
-Documentation
--------------
-
-pydoc extras is your friend. extras currently contains the following functions:
-
-* try_import
-
-* try_imports
-
-* safe_hasattr
-
-Which do what their name suggests.
-
-
-Licensing
----------
-
-This project is distributed under the MIT license and copyright is owned by
-the extras authors. See LICENSE for details.
-
-
-Required Dependencies
----------------------
-
- * Python 2.6+ or 3.0+
-
-
-Bug reports and patches
------------------------
-
-Please report bugs using github issues at <https://github.com/testing-cabal/extras>.
-Patches can also be submitted via github. You can mail the authors directly
-via the mailing list testtools-dev at lists.launchpad.net. (Note that Launchpad
-discards email from unknown addresses - be sure to sign up for a Launchpad
-account before mailing the list, or your mail will be silently discarded).
-
-
-History
--------
-
-extras used to be testtools.helpers, and was factored out when folk wanted to
-use it separately.
-
-
-Thanks
-------
-
- * Martin Pool
diff --git a/lib/extras/extras/__init__.py b/lib/extras/extras/__init__.py
deleted file mode 100644
index 5f16625..0000000
--- a/lib/extras/extras/__init__.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright (c) 2010-2012 extras developers. See LICENSE for details.
-
-"""Extensions to the Python standard library."""
-
-import sys
-
-__all__ = [
- 'safe_hasattr',
- 'try_import',
- 'try_imports',
- ]
-
-# same format as sys.version_info: "A tuple containing the five components of
-# the version number: major, minor, micro, releaselevel, and serial. All
-# values except releaselevel are integers; the release level is 'alpha',
-# 'beta', 'candidate', or 'final'. The version_info value corresponding to the
-# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
-# releaselevel of 'dev' for unreleased under-development code.
-#
-# If the releaselevel is 'alpha' then the major/minor/micro components are not
-# established at this point, and setup.py will use a version of next-$(revno).
-# If the releaselevel is 'final', then the tarball will be major.minor.micro.
-# Otherwise it is major.minor.micro~$(revno).
-
-__version__ = (0, 0, 3, 'final', 0)
-
-
-def try_import(name, alternative=None, error_callback=None):
- """Attempt to import ``name``. If it fails, return ``alternative``.
-
- When supporting multiple versions of Python or optional dependencies, it
- is useful to be able to try to import a module.
-
- :param name: The name of the object to import, e.g. ``os.path`` or
- ``os.path.join``.
- :param alternative: The value to return if no module can be imported.
- Defaults to None.
- :param error_callback: If non-None, a callable that is passed the ImportError
- when the module cannot be loaded.
- """
- module_segments = name.split('.')
- last_error = None
- while module_segments:
- module_name = '.'.join(module_segments)
- try:
- module = __import__(module_name)
- except ImportError:
- last_error = sys.exc_info()[1]
- module_segments.pop()
- continue
- else:
- break
- else:
- if last_error is not None and error_callback is not None:
- error_callback(last_error)
- return alternative
- nonexistent = object()
- for segment in name.split('.')[1:]:
- module = getattr(module, segment, nonexistent)
- if module is nonexistent:
- if last_error is not None and error_callback is not None:
- error_callback(last_error)
- return alternative
- return module
-
-
-_RAISE_EXCEPTION = object()
-def try_imports(module_names, alternative=_RAISE_EXCEPTION, error_callback=None):
- """Attempt to import modules.
-
- Tries to import the first module in ``module_names``. If it can be
- imported, we return it. If not, we go on to the second module and try
- that. The process continues until we run out of modules to try. If none
- of the modules can be imported, either raise an exception or return the
- provided ``alternative`` value.
-
- :param module_names: A sequence of module names to try to import.
- :param alternative: The value to return if no module can be imported.
- If unspecified, we raise an ImportError.
- :param error_callback: If None, called with the ImportError for *each*
- module that fails to load.
- :raises ImportError: If none of the modules can be imported and no
- alternative value was specified.
- """
- module_names = list(module_names)
- for module_name in module_names:
- module = try_import(module_name, error_callback=error_callback)
- if module:
- return module
- if alternative is _RAISE_EXCEPTION:
- raise ImportError(
- "Could not import any of: %s" % ', '.join(module_names))
- return alternative
-
-
-def safe_hasattr(obj, attr, _marker=object()):
- """Does 'obj' have an attribute 'attr'?
-
- Use this rather than built-in hasattr, as the built-in swallows exceptions
- in some versions of Python and behaves unpredictably with respect to
- properties.
- """
- return getattr(obj, attr, _marker) is not _marker
diff --git a/lib/extras/extras/tests/__init__.py b/lib/extras/extras/tests/__init__.py
deleted file mode 100644
index e0d7d4a..0000000
--- a/lib/extras/extras/tests/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2010-2012 extras developers. See LICENSE for details.
-
-"""Tests for extras."""
-
-from unittest import TestSuite, TestLoader
-
-
-def test_suite():
- from extras.tests import (
- test_extras,
- )
- modules = [
- test_extras,
- ]
- loader = TestLoader()
- suites = map(loader.loadTestsFromModule, modules)
- return TestSuite(suites)
diff --git a/lib/extras/extras/tests/test_extras.py b/lib/extras/extras/tests/test_extras.py
deleted file mode 100644
index 33dc87c..0000000
--- a/lib/extras/extras/tests/test_extras.py
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright (c) 2010-2012 extras developers. See LICENSE for details.
-
-from testtools import TestCase
-from testtools.matchers import (
- Equals,
- Is,
- Not,
- )
-
-from extras import (
- safe_hasattr,
- try_import,
- try_imports,
- )
-
-def check_error_callback(test, function, arg, expected_error_count,
- expect_result):
- """General test template for error_callback argument.
-
- :param test: Test case instance.
- :param function: Either try_import or try_imports.
- :param arg: Name or names to import.
- :param expected_error_count: Expected number of calls to the callback.
- :param expect_result: Boolean for whether a module should
- ultimately be returned or not.
- """
- cb_calls = []
- def cb(e):
- test.assertIsInstance(e, ImportError)
- cb_calls.append(e)
- try:
- result = function(arg, error_callback=cb)
- except ImportError:
- test.assertFalse(expect_result)
- else:
- if expect_result:
- test.assertThat(result, Not(Is(None)))
- else:
- test.assertThat(result, Is(None))
- test.assertEquals(len(cb_calls), expected_error_count)
-
-
-class TestSafeHasattr(TestCase):
-
- def test_attribute_not_there(self):
- class Foo(object):
- pass
- self.assertEqual(False, safe_hasattr(Foo(), 'anything'))
-
- def test_attribute_there(self):
- class Foo(object):
- pass
- foo = Foo()
- foo.attribute = None
- self.assertEqual(True, safe_hasattr(foo, 'attribute'))
-
- def test_property_there(self):
- class Foo(object):
- @property
- def attribute(self):
- return None
- foo = Foo()
- self.assertEqual(True, safe_hasattr(foo, 'attribute'))
-
- def test_property_raises(self):
- class Foo(object):
- @property
- def attribute(self):
- 1/0
- foo = Foo()
- self.assertRaises(ZeroDivisionError, safe_hasattr, foo, 'attribute')
-
-
-class TestTryImport(TestCase):
-
- def test_doesnt_exist(self):
- # try_import('thing', foo) returns foo if 'thing' doesn't exist.
- marker = object()
- result = try_import('doesntexist', marker)
- self.assertThat(result, Is(marker))
-
- def test_None_is_default_alternative(self):
- # try_import('thing') returns None if 'thing' doesn't exist.
- result = try_import('doesntexist')
- self.assertThat(result, Is(None))
-
- def test_existing_module(self):
- # try_import('thing', foo) imports 'thing' and returns it if it's a
- # module that exists.
- result = try_import('os', object())
- import os
- self.assertThat(result, Is(os))
-
- def test_existing_submodule(self):
- # try_import('thing.another', foo) imports 'thing' and returns it if
- # it's a module that exists.
- result = try_import('os.path', object())
- import os
- self.assertThat(result, Is(os.path))
-
- def test_nonexistent_submodule(self):
- # try_import('thing.another', foo) imports 'thing' and returns foo if
- # 'another' doesn't exist.
- marker = object()
- result = try_import('os.doesntexist', marker)
- self.assertThat(result, Is(marker))
-
- def test_object_from_module(self):
- # try_import('thing.object') imports 'thing' and returns
- # 'thing.object' if 'thing' is a module and 'object' is not.
- result = try_import('os.path.join')
- import os
- self.assertThat(result, Is(os.path.join))
-
- def test_error_callback(self):
- # the error callback is called on failures.
- check_error_callback(self, try_import, 'doesntexist', 1, False)
-
- def test_error_callback_missing_module_member(self):
- # the error callback is called on failures to find an object
- # inside an existing module.
- check_error_callback(self, try_import, 'os.nonexistent', 1, False)
--
Samba Shared Repository
More information about the samba-cvs
mailing list