1266ebec83 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into warnings-displayed-by-default  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.rst
#	testing/test_terminal.py 
							
						 
						
							2016-07-13 18:45:15 -03:00  
				
					
						
							
							
								 
						
							
								a98e3cefc5 
								
							 
						 
						
							
							
								
								Enable re-writing of setuptools-installed plugins  
							
							... 
							
							
							
							Hook up the PEP 302 import hook very early in pytest startup so
that it gets installed before setuptools-installed plugins are
imported.  Also iterate over all installed plugins and mark them
for rewriting.  If an installed plugin is already imported then
a warning is issued, we can not break since that might break
existing plugins and the fallback will still be gracefull to
plain asserts.
Some existing tests are failing in this commit because of the new
warning triggered by inline pytest runs due to the hypothesis
plugin already being imported.  The tests will be fixed in the next
commit. 
							
						 
						
							2016-07-13 17:29:19 +01:00  
				
					
						
							
							
								 
						
							
								b9a91dc112 
								
							 
						 
						
							
							
								
								merge from master to features  
							
							
							
						 
						
							2016-07-06 11:51:48 +02:00  
				
					
						
							
							
								 
						
							
								94e4a2dd67 
								
							 
						 
						
							
							
								
								* implemented changes recommended by nicoddemus  
							
							
							
						 
						
							2016-07-05 15:22:27 +02:00  
				
					
						
							
							
								 
						
							
								0e2ebc96ff 
								
							 
						 
						
							
							
								
								Remove deprecated cmd options  
							
							... 
							
							
							
							Fixes  #1657  
						
							2016-06-26 19:26:04 +02:00  
				
					
						
							
							
								 
						
							
								e04d9ff80b 
								
							 
						 
						
							
							
								
								* now showing pytest warnings summary by default.  
							
							... 
							
							
							
							* added ``--disable-pytest-warnings` flag to let users disable the warnings summary.
* extended/changed unit tests for the changes in the pytest core. 
							
						 
						
							2016-06-25 18:16:13 +02:00  
				
					
						
							
							
								 
						
							
								856e6cab75 
								
							 
						 
						
							
							
								
								add --override-ini option to overrides ini values  
							
							... 
							
							
							
							Signed-off-by: Ted Xiao <xiao.xj@gmail.com> 
							
						 
						
							2016-06-25 23:45:32 +08:00  
				
					
						
							
							
								 
						
							
								757f37f445 
								
							 
						 
						
							
							
								
								Don't ignore ImportError with setuptools plugins  
							
							... 
							
							
							
							This was added in b2d66b9e7bFixes  #1479 , also see #1307  and #1497  
							
						 
						
							2016-06-25 09:56:22 +02:00  
				
					
						
							
							
								 
						
							
								4350f499b2 
								
							 
						 
						
							
							
								
								Merge branch 'issue1629' of  https://github.com/davehunt/pytest  into features  
							
							
							
						 
						
							2016-06-21 18:37:14 +02:00  
				
					
						
							
							
								 
						
							
								ef9dd14963 
								
							 
						 
						
							
							
								
								Introduce pytest command as recommended entry point  
							
							... 
							
							
							
							Fixes  #1629  
						
							2016-06-21 16:16:57 +02:00  
				
					
						
							
							
								 
						
							
								3a81d2e012 
								
							 
						 
						
							
							
								
								conftest files now use assertion rewriting  
							
							... 
							
							
							
							Fix  #1619  
						
							2016-06-20 23:13:29 +02:00  
				
					
						
							
							
								 
						
							
								1a37035d71 
								
							 
						 
						
							
							
								
								Add test test_absolute_win32_path  
							
							
							
						 
						
							2016-04-20 01:27:37 +08:00  
				
					
						
							
							
								 
						
							
								a965386b9e 
								
							 
						 
						
							
							
								
								Add bool type to addini  
							
							
							
						 
						
							2016-02-14 20:52:27 -02:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								67236d6de3 
								
							 
						 
						
							
							
								
								strengthen the ini assertion  
							
							
							
						 
						
							2015-10-09 09:58:12 -07:00  
				
					
						
							
							
								 
						
							
								0e55a8793f 
								
							 
						 
						
							
							
								
								all tests pass  
							
							
							
						 
						
							2015-10-09 09:58:12 -07:00  
				
					
						
							
							
								 
						
							
								49d46a0059 
								
							 
						 
						
							
							
								
								an ugly patch to fix all but the most important part =/  
							
							
							
						 
						
							2015-10-08 10:44:58 -07:00  
				
					
						
							
							
								 
						
							
								616d8251f3 
								
							 
						 
						
							
							
								
								unit tests of Config.fromdictargs. currently failing  
							
							
							
						 
						
							2015-10-08 10:44:58 -07:00  
				
					
						
							
							
								 
						
							
								e59471766a 
								
							 
						 
						
							
							
								
								Rename "warnings" to "pytest-warnings" in terminal output  
							
							... 
							
							
							
							Fix  #970  
						
							2015-08-27 19:59:52 -03:00  
				
					
						
							
							
								 
						
							
								42b43a7d7b 
								
							 
						 
						
							
							
								
								Paths after normal options are now properly used to discover rootdir and ini files  
							
							... 
							
							
							
							Fix  #949  
						
							2015-08-25 22:08:05 -03:00  
				
					
						
							
							
								 
						
							
								2ffd37b816 
								
							 
						 
						
							
							
								
								return non-zero exit code if no tests are collected  
							
							... 
							
							
							
							Fix  #812 
Fix  #500  
						
							2015-08-18 07:35:02 -03:00  
				
					
						
							
							
								 
						
							
								8a6aa5e17e 
								
							 
						 
						
							
							
								
								Print inifile and rootdir when there's usage errors  
							
							... 
							
							
							
							Related to #821  
							
						 
						
							2015-07-10 21:56:12 -03:00  
				
					
						
							
							
								 
						
							
								25963e0544 
								
							 
						 
						
							
							
								
								adapt pytest to pluggy's decoratorclass branch  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-04-29 16:40:52 +02:00  
				
					
						
							
							
								 
						
							
								9aec5cd52d 
								
							 
						 
						
							
							
								
								use runpytest() instead of runpytest_inprocess if a test can run as subprocess as well  
							
							... 
							
							
							
							--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 12:05:08 +02:00  
				
					
						
							
							
								 
						
							
								db5649ec6a 
								
							 
						 
						
							
							
								
								streamline pytester API majorly:  
							
							... 
							
							
							
							- integrate conftest into pytester plugin
- introduce runpytest() to either call runpytest_inline (default) or
  runpytest_subprocess (python -m pytest)
- move testdir.inline_runsource1 to pdb tests
- strike some unneccessary methods.
- a new section "writing plugins" and some better pytester docs
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:53 +02:00  
				
					
						
							
							
								 
						
							
								d3e363b97a 
								
							 
						 
						
							
							
								
								- make API between runpytest() and inline_run() more similar  
							
							... 
							
							
							
							- shift a number of tests to become inline_run() tests
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:45 +02:00  
				
					
						
							
							
								 
						
							
								424e5d1394 
								
							 
						 
						
							
							
								
								make test suite more tolerable against xdist causing warnings itself (which it does  
							
							... 
							
							
							
							currently)
--HG--
branch : plugtestfix 
							
						 
						
							2015-04-27 15:06:47 +02:00  
				
					
						
							
							
								 
						
							
								3a1374e69c 
								
							 
						 
						
							
							
								
								simplify plugins bookkeeping further, refine API  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 20:17:32 +02:00  
				
					
						
							
							
								 
						
							
								9c5495832c 
								
							 
						 
						
							
							
								
								avoid direct circular reference between config and pluginmanager  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 18:14:41 +02:00  
				
					
						
							
							
								 
						
							
								e7a2e53108 
								
							 
						 
						
							
							
								
								Streamline data structures  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 13:38:29 +02:00  
				
					
						
							
							
								 
						
							
								02a4042dca 
								
							 
						 
						
							
							
								
								incrementally update hook call lists instead of regenerating the whole  
							
							... 
							
							
							
							list on each registered plugin
--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
				
					
						
							
							
								 
						
							
								d73e689991 
								
							 
						 
						
							
							
								
								fix issue616 - conftest visibility fixes.  This is achieved by  
							
							... 
							
							
							
							refactoring how nodeid's are constructed.  They now are always
relative to the "common rootdir" of a test run which is determined by
finding a common ancestor of all testrun arguments.
--HG--
branch : issue616 
							
						 
						
							2015-02-26 21:56:44 +01:00  
				
					
						
							
							
								 
						
							
								912c8f0540 
								
							 
						 
						
							
							
								
								Use monkeypatch to set the PYTEST_ADDOPTS environment variable in the test.  
							
							... 
							
							
							
							--HG--
branch : env-addopts 
							
						 
						
							2015-01-29 10:52:01 +00:00  
				
					
						
							
							
								 
						
							
								7325a5fe2e 
								
							 
						 
						
							
							
								
								Support setting configuration using the PYTEST_ADDOPTS environment variable.  
							
							... 
							
							
							
							--HG--
branch : env-addopts 
							
						 
						
							2015-01-23 20:09:42 +00:00  
				
					
						
							
							
								 
						
							
								c8264385ea 
								
							 
						 
						
							
							
								
								Implement the "-c" command line switch that allows to explicitly specifiy the config file to load.  
							
							... 
							
							
							
							This feature was requested in issue #174 .
--HG--
branch : explicit-ini-filename 
							
						 
						
							2014-06-27 17:42:37 +02:00  
				
					
						
							
							
								 
						
							
								54c88a6cf3 
								
							 
						 
						
							
							
								
								fix flakes issues  
							
							
							
						 
						
							2014-06-16 11:27:32 +02:00  
				
					
						
							
							
								 
						
							
								d6281b4206 
								
							 
						 
						
							
							
								
								- restore compatibility to old getvalueorskip behaviour  
							
							... 
							
							
							
							- introduce a better NOTSET representation to improve docs 
							
						 
						
							2014-05-14 07:36:31 +02:00  
				
					
						
							
							
								 
						
							
								0365e5c3a0 
								
							 
						 
						
							
							
								
								cleanup internal conftest handling and avoid the strange None entry in the conftest cache.  
							
							... 
							
							
							
							(There is basically no reason to ask for conftestmodules without specifying a path.)
--HG--
branch : conftest-clean 
							
						 
						
							2014-04-02 22:30:45 +02:00  
				
					
						
							
							
								 
						
							
								3bca62e9e4 
								
							 
						 
						
							
							
								
								fix issue436: improved finding of initial conftest files from command  
							
							... 
							
							
							
							line arguments by using the result of parse_known_args rather than
the previous flaky heuristics.  Thanks Marc Abramowitz for tests
and initial fixing approaches in this area. 
							
						 
						
							2014-04-02 11:29:23 +02:00  
				
					
						
							
							
								 
						
							
								1b387bea62 
								
							 
						 
						
							
							
								
								introduce warning system with this API:  
							
							... 
							
							
							
							- node.warn() for a node-specific warning
- config.warn() for a global non-node specific warning
Each warning is accompanied by a "warning number" so that we can later
introduce mechanisms for surpressing them.
Each warning will trigger a call to pytest_report_warn(number, node, message)
which is by default implemented by the TerminalReporter which introduces
a new option "-rw" to show details about warnings. 
							
						 
						
							2014-03-11 22:10:17 +01:00  
				
					
						
							
							
								 
						
							
								657a395839 
								
							 
						 
						
							
							
								
								fix comment typos  
							
							
							
						 
						
							2014-01-18 12:39:16 +01:00  
				
					
						
							
							
								 
						
							
								9fb2079458 
								
							 
						 
						
							
							
								
								replace py.test module references with pytest  
							
							... 
							
							
							
							The only remaining 'py.test' references are:
 * those referring to the 'py.test' executable
 * those in code explicitly testing py.test/pytest module compatibility
 * those in old CHANGES documentation
 * those in documentation generated based on external data
 * those in seemingly unfinished & unmaintained Japanese documentation
Minor stylistic changes and typo corrections made to documentation next to
several applied py.test --> pytest content changes. 
							
						 
						
							2014-01-18 12:31:33 +01:00  
				
					
						
							
							
								 
						
							
								2700a94d49 
								
							 
						 
						
							
							
								
								remove an old duplicate marker and use recent pytest mechanism for parametrization  
							
							
							
						 
						
							2013-11-21 14:40:14 +01:00  
				
					
						
							
							
								 
						
							
								8ac5af2896 
								
							 
						 
						
							
							
								
								fix flakes issues and make --flakes run part of tox runs  
							
							
							
						 
						
							2013-10-12 15:39:22 +02:00  
				
					
						
							
							
								 
						
							
								1db6fc87c7 
								
							 
						 
						
							
							
								
								Allow unicode strings in parser.add_argument()  
							
							... 
							
							
							
							This fixes issue360 by also converting unicode strings to the argparse
syntax instead of just native strings. 
							
						 
						
							2013-10-01 13:20:20 +01:00  
				
					
						
							
							
								 
						
							
								db6f347db6 
								
							 
						 
						
							
							
								
								fix issue358 -- introduce new pytest_load_initial_conftests hook and make capturing initialization use it, relying on a new (somewhat internal) parser.parse_known_args() method.  
							
							... 
							
							
							
							This also addresses issue359 -- plugins like pytest-django could implement a pytest_load_initial_conftests hook like the capture plugin. 
							
						 
						
							2013-09-30 13:14:16 +02:00  
				
					
						
							
							
								 
						
							
								4b709037ab 
								
							 
						 
						
							
							
								
								some more separation of core pluginmanager from pytest specific functionality.  
							
							... 
							
							
							
							Idea is to have the PluginManager be re-useable from other projects at some point. 
							
						 
						
							2013-09-30 13:14:14 +02:00  
				
					
						
							
							
								 
						
							
								fad7bd4393 
								
							 
						 
						
							
							
								
								simplify Config constructor  
							
							
							
						 
						
							2013-09-28 22:22:53 +02:00  
				
					
						
							
							
								 
						
							
								a9adfa9114 
								
							 
						 
						
							
							
								
								don't run long-args test on windows because it can't work  
							
							
							
						 
						
							2012-11-20 11:52:06 +01:00  
				
					
						
							
							
								 
						
							
								c64c567b75 
								
							 
						 
						
							
							
								
								fix issue224 - invocations with >256 char arguments now work  
							
							
							
						 
						
							2012-11-12 10:15:43 +01:00  
				
					
						
							
							
								 
						
							
								33cd414420 
								
							 
						 
						
							
							
								
								fix issue127 improve pytest_addoption docs, add new config.getoption(name) method for consistency.  
							
							
							
						 
						
							2012-11-06 14:09:12 +01:00  
				
					
						
							
							
								 
						
							
								979dfd20f2 
								
							 
						 
						
							
							
								
								add a method to the config object to dynamically add a value to an (line-type) ini-value  
							
							
							
						 
						
							2011-11-11 22:56:08 +00:00  
				
					
						
							
							
								 
						
							
								a2f4a11301 
								
							 
						 
						
							
							
								
								refine lsof/FD leakage testing and rework test setup and some of pytest own tests.   Note that the actual diff to non-test code is small.  Also remove some redundant tests (introduced by a copy-paste-error apparently in test_mark.py).  
							
							
							
						 
						
							2011-11-07 18:08:41 +00:00  
				
					
						
							
							
								 
						
							
								f2512017ea 
								
							 
						 
						
							
							
								
								correctly handle zero length cmdline arguments  
							
							
							
						 
						
							2011-09-25 23:26:49 +02:00  
				
					
						
							
							
								 
						
							
								650c3bcfde 
								
							 
						 
						
							
							
								
								enhance debug tracing: print trace tags at the end of message and forget about "prefix".  
							
							... 
							
							
							
							Always log to "pytestdebug.log" if "--debug" option is given.
also move related code to pytest_helpconfig plugin. 
							
						 
						
							2011-07-14 19:11:50 +02:00  
				
					
						
							
							
								 
						
							
								88cfaebbcb 
								
							 
						 
						
							
							
								
								fix issue12 - show plugin versions with "--version" and "--traceconfig" and also document how to add extra information to reporting test header  
							
							
							
						 
						
							2011-01-12 19:39:36 +01:00  
				
					
						
							
							
								 
						
							
								a15983cb33 
								
							 
						 
						
							
							
								
								rather named the new hook cmdline_preparse  
							
							
							
						 
						
							2010-12-07 12:34:18 +01:00  
				
					
						
							
							
								 
						
							
								9ab256c296 
								
							 
						 
						
							
							
								
								make getvalueorskip() be hidden in skip-reporting. also bump version.  
							
							
							
						 
						
							2010-12-07 12:18:24 +01:00  
				
					
						
							
							
								 
						
							
								7db9e98b55 
								
							 
						 
						
							
							
								
								introduce a pytest_cmdline_processargs hook to modify/add dynamically to command line arguments.  
							
							
							
						 
						
							2010-12-07 12:14:12 +01:00  
				
					
						
							
							
								 
						
							
								c7531705fc 
								
							 
						 
						
							
							
								
								refine plugin registration, allow new "-p no:NAME" way to prevent/undo plugin registration  
							
							
							
						 
						
							2010-12-06 16:54:42 +01:00  
				
					
						
							
							
								 
						
							
								f456e376b9 
								
							 
						 
						
							
							
								
								refine tmpdir handling and docs  
							
							... 
							
							
							
							- clear tmpdir specified with --basetemp
- remove config.mktmp and config.getbasetemp methods 
							
						 
						
							2010-11-21 17:43:18 +01:00  
				
					
						
							
							
								 
						
							
								a698465487 
								
							 
						 
						
							
							
								
								streamline docs, especially use "import pytest" and "pytest.*" in python code examples instead of "import py" and "py.test.*".  
							
							
							
						 
						
							2010-11-17 22:12:16 +01:00  
				
					
						
							
							
								 
						
							
								929291775e 
								
							 
						 
						
							
							
								
								flat is better than nested (cont'd):  
							
							... 
							
							
							
							- pytest.py is new module, making "python -m pytest" work always
- _pytest/*.py now contains core.py, hookspec and the plugins, no sub packages 
							
						 
						
							2010-11-13 11:10:45 +01:00  
				
					
						
							
							
								 
						
							
								55dff651f4 
								
							 
						 
						
							
							
								
								refine initilization: read config also from a "pytest.ini" file if exists  
							
							... 
							
							
							
							and revert earlier commandline option and group ordering change. 
							
						 
						
							2010-11-07 16:10:22 +01:00  
				
					
						
							
							
								 
						
							
								d9ad2e7cce 
								
							 
						 
						
							
							
								
								some python3 related fixes  
							
							
							
						 
						
							2010-11-07 01:10:15 +01:00  
				
					
						
							
							
								 
						
							
								6dac77433e 
								
							 
						 
						
							
							
								
								majorly refactor collection process  
							
							... 
							
							
							
							- get rid of py.test.collect.Directory alltogether.
- introduce direct node.nodeid attribute
- remove now superflous attributes on collect and test reports 
							
						 
						
							2010-11-06 09:58:04 +01:00  
				
					
						
							
							
								 
						
							
								6a734efe44 
								
							 
						 
						
							
							
								
								introduce a minimal tag-based tracer, to be extended if needed, strike pytest_trace hook.  
							
							
							
						 
						
							2010-11-05 23:37:31 +01:00  
				
					
						
							
							
								 
						
							
								bb732a4e75 
								
							 
						 
						
							
							
								
								add "linelist" type for ini-files  
							
							
							
						 
						
							2010-11-05 23:37:31 +01:00  
				
					
						
							
							
								 
						
							
								fed8f19156 
								
							 
						 
						
							
							
								
								introduce norecursedirs config option, remove recfilter()  
							
							
							
						 
						
							2010-11-04 23:21:26 +01:00  
				
					
						
							
							
								 
						
							
								32ac7a7c6e 
								
							 
						 
						
							
							
								
								rename addargs to addopts, make adding of opts configurable  
							
							
							
						 
						
							2010-11-01 08:55:14 +01:00  
				
					
						
							
							
								 
						
							
								85c24b7fa1 
								
							 
						 
						
							
							
								
								some test fixes and refinements  
							
							
							
						 
						
							2010-11-01 08:16:10 +01:00  
				
					
						
							
							
								 
						
							
								b6ec5a575d 
								
							 
						 
						
							
							
								
								get option settings from ini-file.  make getting configuration options from conftest.py only an internal feature.  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-10-31 17:41:58 +01:00  
				
					
						
							
							
								 
						
							
								c9e629c870 
								
							 
						 
						
							
							
								
								remove old ways to set option defaults, relying on global setup.cfg or tox.ini files now.  
							
							... 
							
							
							
							revamp py.test --help-config
--HG--
branch : trunk 
							
						 
						
							2010-10-27 22:29:01 +02:00  
				
					
						
							
							
								 
						
							
								b86b1628bb 
								
							 
						 
						
							
							
								
								introduce reading of setup.cfg / ini-style configuration files  
							
							... 
							
							
							
							rename internal config.Error to pytest.UsageError
--HG--
branch : trunk 
							
						 
						
							2010-10-27 19:35:27 +02:00  
				
					
						
							
							
								 
						
							
								32fce34825 
								
							 
						 
						
							
							
								
								move config to _config  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-10-10 13:48:49 +02:00  
				
					
						
							
							
								 
						
							
								e2683f4538 
								
							 
						 
						
							
							
								
								refactor all collection related logic  
							
							... 
							
							
							
							- drop all pickling support (for now)
- perform collection completely ahead of test running (no iterativity)
- introduce new collection related hooks
- shift all keyword-selection code to pytest_keyword plugin
- simplify session object
- besides: fix issue88
--HG--
branch : trunk 
							
						 
						
							2010-09-15 10:30:50 +02:00  
				
					
						
							
							
								 
						
							
								677f7c0a6a 
								
							 
						 
						
							
							
								
								remove trailing whitespace everywhere  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-07-26 21:15:15 +02:00  
				
					
						
							
							
								 
						
							
								78d33a2f28 
								
							 
						 
						
							
							
								
								* rather expose internal exceptions under py.test.ACTION.Exception  
							
							... 
							
							
							
							with ACTION being skip, fail, exit, raises.
* move and refine test_outcome.py tests into runner tests
--HG--
branch : trunk 
							
						 
						
							2010-04-28 08:42:56 +02:00  
				
					
						
							
							
								 
						
							
								d5e463605e 
								
							 
						 
						
							
							
								
								* properly expose and document runtest-protocol related Exceptions  
							
							... 
							
							
							
							and move all definitions to the runner plugin for now.
* also move EXIT codes to session.py, obsoleting outcome.py alltogether.
--HG--
branch : trunk 
							
						 
						
							2010-04-27 21:13:09 +02:00  
				
					
						
							
							
								 
						
							
								8131f5bdc0 
								
							 
						 
						
							
							
								
								(fixes issue83) don't try to import conftest from an invalid package path, refine path.pyimport() logic  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-04-27 15:49:13 +02:00  
				
					
						
							
							
								 
						
							
								95de17b652 
								
							 
						 
						
							
							
								
								refine tests and refine code to deal with new xdist semantics.  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-01-17 23:23:02 +01:00  
				
					
						
							
							
								 
						
							
								9da1ba40ed 
								
							 
						 
						
							
							
								
								move down py/impl/XYZ to py/_XYZ  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-01-13 17:15:54 +01:00  
				
					
						
							
							
								 
						
							
								5c27076d32 
								
							 
						 
						
							
							
								
								flatten test directory hierarchy and merge smaller into larger files  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-01-13 16:17:50 +01:00