c49863aa63 
								
							 
						 
						
							
							
								
								merge next chunk from master and fix changelog linting issue  
							
							
							
						 
						
							2016-05-13 19:36:47 +02:00  
				
					
						
							
							
								 
						
							
								56855893ca 
								
							 
						 
						
							
							
								
								Raise CollectError if import test module fails  
							
							... 
							
							
							
							One of the reasons for failing to import the test module is invalid Python
identifiers in the full package path of the test module.
fix  #1426  
							
						 
						
							2016-04-23 13:50:48 +02:00  
				
					
						
							
							
								 
						
							
								053c052190 
								
							 
						 
						
							
							
								
								Always lstrip() keyword expression  
							
							
							
						 
						
							2016-04-01 13:10:05 -04:00  
				
					
						
							
							
								 
						
							
								8ce32b0795 
								
							 
						 
						
							
							
								
								When a regex pattern contains bytes instead of a string use escape_encode to turn it into a string before further processing. Thanks @nicoddemus for the review and tips!  
							
							
							
						 
						
							2016-03-05 21:04:34 -05:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								af893aab26 
								
							 
						 
						
							
							
								
								Remove code related to support python <= 2.5  
							
							... 
							
							
							
							Fix  #1226  
						
							2015-12-16 16:16:22 -02:00  
				
					
						
							
							
								 
						
							
								2ffd37b816 
								
							 
						 
						
							
							
								
								return non-zero exit code if no tests are collected  
							
							... 
							
							
							
							Fix  #812 
Fix  #500  
						
							2015-08-18 07:35:02 -03:00  
				
					
						
							
							
								 
						
							
								e103932aad 
								
							 
						 
						
							
							
								
								Reintroduce hasplugin to PytestPluginManager  
							
							... 
							
							
							
							Fix  #932  
						
							2015-08-09 19:30:49 -03:00  
				
					
						
							
							
								 
						
							
								9f94e443ff 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	testing/conftest.py 
							
						 
						
							2015-07-24 19:24:21 -03:00  
				
					
						
							
							
								 
						
							
								35bbcc39a2 
								
							 
						 
						
							
							
								
								Interpret strings to "plugins" arg in pytest.main() as module names  
							
							... 
							
							
							
							See #855  
							
						 
						
							2015-07-23 23:37:09 -03:00  
				
					
						
							
							
								 
						
							
								3c2fd833ca 
								
							 
						 
						
							
							
								
								Reintroduce get_plugin_manager() for backward-compatibility  
							
							... 
							
							
							
							PyCharm pytest runner depends on this function existing (see #787 ).
Added reference to get_plugin_manager() and PluginManager/PytestPluginManager to docs 
							
						 
						
							2015-06-25 00:48:47 -03: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  
				
					
						
							
							
								 
						
							
								a8afba054a 
								
							 
						 
						
							
							
								
								- refine lsof checking  
							
							... 
							
							
							
							- make runpytest() create an inline testing process instead of
  a subprocess one
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:46 +02:00  
				
					
						
							
							
								 
						
							
								15328c04eb 
								
							 
						 
						
							
							
								
								Handle inspect.getsourcelines failures in FixtureLookupError  
							
							... 
							
							
							
							Fixes  #553 
--HG--
branch : getsourcelines-error-issue-553-pytest2.7 
						
							2015-04-15 19:31:22 -03:00  
				
					
						
							
							
								 
						
							
								51cff6f106 
								
							 
						 
						
							
							
								
								fix issue486: better reporting and handling of early conftest loading failures  
							
							... 
							
							
							
							--HG--
branch : issue486 
							
						 
						
							2014-04-02 20:42:41 +02:00  
				
					
						
							
							
								 
						
							
								2e1f6c85f6 
								
							 
						 
						
							
							
								
								introduce resume/suspend functionality for FDCapture and SysCapture,  
							
							... 
							
							
							
							fixing problems with early bailouts (from argparse's parse() function e.g.)
that wrote to stdout. 
							
						 
						
							2014-04-01 14:19:58 +02:00  
				
					
						
							
							
								 
						
							
								2b8a54d5d9 
								
							 
						 
						
							
							
								
								refine skipif to use direct booleans, to help with flakes  
							
							
							
						 
						
							2014-01-29 11:46:36 +01:00  
				
					
						
							
							
								 
						
							
								97da43d909 
								
							 
						 
						
							
							
								
								merge from default  
							
							... 
							
							
							
							--HG--
branch : multi-usageerror 
							
						 
						
							2014-01-25 10:42:21 +01:00  
				
					
						
							
							
								 
						
							
								83620ced2e 
								
							 
						 
						
							
							
								
								trim trailing spaces  
							
							
							
						 
						
							2014-01-18 10:40:20 +01:00  
				
					
						
							
							
								 
						
							
								e118682db1 
								
							 
						 
						
							
							
								
								Added test for previous crash on failed import fix  
							
							... 
							
							
							
							Also, rewrote the fix a bit.
ref #383 . 
							
						 
						
							2013-11-15 14:03:57 -05:00  
				
					
						
							
							
								 
						
							
								8ac5af2896 
								
							 
						 
						
							
							
								
								fix flakes issues and make --flakes run part of tox runs  
							
							
							
						 
						
							2013-10-12 15:39:22 +02:00  
				
					
						
							
							
								 
						
							
								d226b2faf4 
								
							 
						 
						
							
							
								
								release announcement, bump version numbers, some test adapatations because of random win32 test failures.  
							
							
							
						 
						
							2013-10-01 12:37:11 +02:00  
				
					
						
							
							
								 
						
							
								2c7d00579b 
								
							 
						 
						
							
							
								
								bump version, some windows test fixes, prevent logging from raising exceptions at the end (finally), add py25 to tox.ini.  
							
							
							
						 
						
							2013-09-30 16:09:26 +02:00  
				
					
						
							
							
								 
						
							
								a930f44e60 
								
							 
						 
						
							
							
								
								introduce pluginmanager.ensure_teardown() which allows  
							
							
							
						 
						
							2013-09-28 22:23:00 +02:00  
				
					
						
							
							
								 
						
							
								cf37c477bb 
								
							 
						 
						
							
							
								
								output errors for all failures of specific collection  
							
							... 
							
							
							
							when issueing a command with many specific items to collect,
print all collect failures instead of just the first one
--HG--
branch : multi-usageerror 
							
						 
						
							2013-09-08 22:26:51 +02:00  
				
					
						
							
							
								 
						
							
								8f24e10571 
								
							 
						 
						
							
							
								
								add changelog entry for anthon's hynek-fication of options,  
							
							... 
							
							
							
							and change the docs and tests to use the new style. 
							
						 
						
							2013-08-01 17:32:19 +02:00  
				
					
						
							
							
								 
						
							
								712898cfe1 
								
							 
						 
						
							
							
								
								- add release announce  
							
							
							
						 
						
							2013-03-28 10:21:03 +01:00  
				
					
						
							
							
								 
						
							
								69ef750091 
								
							 
						 
						
							
							
								
								fix issue134 - print the collect errors that prevent running specified test items  
							
							
							
						 
						
							2013-02-14 12:21:42 +01:00  
				
					
						
							
							
								 
						
							
								5173647b4d 
								
							 
						 
						
							
							
								
								fixes to against python3.3  
							
							
							
						 
						
							2012-10-01 10:14:54 +02:00  
				
					
						
							
							
								 
						
							
								51d94a4a6e 
								
							 
						 
						
							
							
								
								use higher difference on timing  
							
							
							
						 
						
							2012-05-18 13:56:49 +02:00  
				
					
						
							
							
								 
						
							
								e18abfd013 
								
							 
						 
						
							
							
								
								fix issue143 - call unconfigure/sessionfinish always when  
							
							... 
							
							
							
							configure/sessionstart where called
use exitcode 4 (instead of 3 which signaled an internal error)
when an initial directory/file was not found 
							
						 
						
							2012-05-17 23:11:23 +02:00  
				
					
						
							
							
								 
						
							
								268c051eba 
								
							 
						 
						
							
							
								
								propogate current PYTHONPATH  
							
							
							
						 
						
							2011-12-19 12:02:07 -05:00  
				
					
						
							
							
								 
						
							
								bd296c796f 
								
							 
						 
						
							
							
								
								try to avoid timing/race condition  
							
							
							
						 
						
							2011-11-08 23:04:31 +00:00  
				
					
						
							
							
								 
						
							
								7144cec580 
								
							 
						 
						
							
							
								
								avoid race condition in test, fix doc link  
							
							
							
						 
						
							2011-11-08 22:06:57 +00:00  
				
					
						
							
							
								 
						
							
								99a1188287 
								
							 
						 
						
							
							
								
								simplify durations output, no percentage, no "remaining" bits  
							
							
							
						 
						
							2011-11-08 20:57:19 +00:00  
				
					
						
							
							
								 
						
							
								0b18b6094e 
								
							 
						 
						
							
							
								
								fix duration option in case of collection errors  
							
							
							
						 
						
							2011-11-08 19:00:25 +00:00  
				
					
						
							
							
								 
						
							
								a324826dfd 
								
							 
						 
						
							
							
								
								separate out the duration tests  
							
							
							
						 
						
							2011-11-08 18:12:16 +00:00  
				
					
						
							
							
								 
						
							
								29bf205f3a 
								
							 
						 
						
							
							
								
								make --durations also show the execution times of setup/teardown calls. This requires a slight incompatibility - pytest_runtest_logreport now sees setup/teardown reports even if the tests passed.  
							
							
							
						 
						
							2011-11-08 17:53:46 +00:00  
				
					
						
							
							
								 
						
							
								3b9fd3abd8 
								
							 
						 
						
							
							
								
								introduce --durations=N showing slowest test executions  
							
							
							
						 
						
							2011-11-08 17:20:56 +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  
				
					
						
							
							
								 
						
							
								5ae04397bd 
								
							 
						 
						
							
							
								
								proper tests for issue74, thanks Arfrever  
							
							
							
						 
						
							2011-10-26 23:59:22 +02:00  
				
					
						
							
							
								 
						
							
								2c230f910d 
								
							 
						 
						
							
							
								
								fix issue74 - propperly filter out missfit names in _tryconvertpyarg  
							
							
							
						 
						
							2011-10-26 22:40:08 +02:00  
				
					
						
							
							
								 
						
							
								d37af98db3 
								
							 
						 
						
							
							
								
								try to make test suite pass on jython 2.5.1 again  
							
							
							
						 
						
							2011-09-21 08:12:37 +02:00  
				
					
						
							
							
								 
						
							
								eaec527a60 
								
							 
						 
						
							
							
								
								relax error string matching  
							
							
							
						 
						
							2011-09-21 06:21:48 +02:00  
				
					
						
							
							
								 
						
							
								5c32421f2e 
								
							 
						 
						
							
							
								
								merge, bump version  
							
							
							
						 
						
							2011-09-12 08:57:35 +02:00  
				
					
						
							
							
								 
						
							
								2315de8321 
								
							 
						 
						
							
							
								
								Add FIXME.  
							
							
							
						 
						
							2011-09-05 22:01:50 +02:00  
				
					
						
							
							
								 
						
							
								25711a0879 
								
							 
						 
						
							
							
								
								Add acceptance test for new --pyargs behavior.  
							
							
							
						 
						
							2011-09-05 17:38:22 +02:00  
				
					
						
							
							
								 
						
							
								c426a67b0e 
								
							 
						 
						
							
							
								
								make test skipping more precise to fix a py32 test failure  
							
							
							
						 
						
							2011-08-18 22:52:02 +02:00  
				
					
						
							
							
								 
						
							
								2618e3640f 
								
							 
						 
						
							
							
								
								account for quotes in error messages  
							
							
							
						 
						
							2011-06-03 22:11:00 -05:00  
				
					
						
							
							
								 
						
							
								e3b2792677 
								
							 
						 
						
							
							
								
								fix issue49 - avoid confusing errors when initialization goes wrong  
							
							
							
						 
						
							2011-06-01 14:54:34 +02:00  
				
					
						
							
							
								 
						
							
								942ae47cd1 
								
							 
						 
						
							
							
								
								tentatively use internal list for cleanups at unconfigure time - this helps reporting with partially executed pytest_configure() hooks  
							
							
							
						 
						
							2011-04-17 12:20:13 +02:00  
				
					
						
							
							
								 
						
							
								06ca7090f9 
								
							 
						 
						
							
							
								
								fix issue38 - nicer tracebacks on sessionstart/configure (and other internal/custom hook failures)  
							
							
							
						 
						
							2011-04-17 12:20:11 +02:00  
				
					
						
							
							
								 
						
							
								c552b58dc5 
								
							 
						 
						
							
							
								
								fix issue27 - --collectonly and -k keyword selection now work together.  
							
							... 
							
							
							
							internally, collectonly and terminal reporting has been unified. 
							
						 
						
							2011-03-06 18:32:00 +01:00  
				
					
						
							
							
								 
						
							
								3004fe3915 
								
							 
						 
						
							
							
								
								fix the last committed laxation of a test  
							
							
							
						 
						
							2011-02-04 23:20:27 +01:00  
				
					
						
							
							
								 
						
							
								eb225456d7 
								
							 
						 
						
							
							
								
								laxer test for also passing it with pypy  
							
							
							
						 
						
							2011-02-04 22:51:05 +01:00  
				
					
						
							
							
								 
						
							
								762ea71f67 
								
							 
						 
						
							
							
								
								fix error reporting issue when a "pyc" file has no relating "py"  
							
							
							
						 
						
							2011-01-27 21:11:21 +01:00  
				
					
						
							
							
								 
						
							
								821f493378 
								
							 
						 
						
							
							
								
								check docstring at test time instead of runtime, improve and test warning on assertion turned off (thanks FND for reporting)  
							
							
							
						 
						
							2010-12-09 11:00:31 +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  
				
					
						
							
							
								 
						
							
								582486d531 
								
							 
						 
						
							
							
								
								refine docs and docstrings, fix some small bits here and there while doing that.  
							
							
							
						 
						
							2010-11-18 14:56:16 +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  
				
					
						
							
							
								 
						
							
								2a825169b2 
								
							 
						 
						
							
							
								
								fix doctest IDs, also fix tree traversal and remove dead code  
							
							
							
						 
						
							2010-11-17 18:24:28 +01:00  
				
					
						
							
							
								 
						
							
								fb102a2ddb 
								
							 
						 
						
							
							
								
								bump version and comment out ignore-testclass-if-unittest-module-feature  
							
							
							
						 
						
							2010-11-17 12:21:24 +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  
				
					
						
							
							
								 
						
							
								2e4e9eb745 
								
							 
						 
						
							
							
								
								internally use pytest.* instead of ``py.test.*`` in many places.  
							
							... 
							
							
							
							make sub namespace names 'collect' and 'cmdline' available on pytest directly 
							
						 
						
							2010-11-13 09:05:11 +01:00  
				
					
						
							
							
								 
						
							
								582a2100b1 
								
							 
						 
						
							
							
								
								fix test, bump version  
							
							
							
						 
						
							2010-11-07 07:14:50 +01:00  
				
					
						
							
							
								 
						
							
								d9ad2e7cce 
								
							 
						 
						
							
							
								
								some python3 related fixes  
							
							
							
						 
						
							2010-11-07 01:10:15 +01:00  
				
					
						
							
							
								 
						
							
								8716b391c7 
								
							 
						 
						
							
							
								
								PYTHONDONTWRITEBYTECODE might not be set  
							
							
							
						 
						
							2010-11-06 18:36:24 -05:00  
				
					
						
							
							
								 
						
							
								885c7ce281 
								
							 
						 
						
							
							
								
								some fixes for --pyargs situations and the docs, remove wrongly added test  
							
							
							
						 
						
							2010-11-07 00:22:16 +01:00  
				
					
						
							
							
								 
						
							
								d0ac4135a2 
								
							 
						 
						
							
							
								
								introduce an option that avoids discovery of classes other than unittest.TestCase in modules  
							
							... 
							
							
							
							importing unittest. 
							
						 
						
							2010-11-06 23:45:48 +01:00  
				
					
						
							
							
								 
						
							
								707775dcfa 
								
							 
						 
						
							
							
								
								introduce new --testpkg importpath option, add more meat to draft release announcement  
							
							
							
						 
						
							2010-11-06 22:17:33 +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  
				
					
						
							
							
								 
						
							
								d108235095 
								
							 
						 
						
							
							
								
								implement and document new invocation mechanisms, see doc/usage.txt  
							
							... 
							
							
							
							also rename pytest._core to pytest.main for convenience. 
							
						 
						
							2010-11-05 23:37:31 +01:00  
				
					
						
							
							
								 
						
							
								85c24b7fa1 
								
							 
						 
						
							
							
								
								some test fixes and refinements  
							
							
							
						 
						
							2010-11-01 08:16:10 +01: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  
				
					
						
							
							
								 
						
							
								603ff3a64f 
								
							 
						 
						
							
							
								
								also check for stderr, add changelog entry  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-10-24 23:43:35 +02:00  
				
					
						
							
							
								 
						
							
								b4210f3ae0 
								
							 
						 
						
							
							
								
								fix issue93 - hide output of code in early-loaded conftest files  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-10-24 23:26:14 +02:00  
				
					
						
							
							
								 
						
							
								17719b99a1 
								
							 
						 
						
							
							
								
								select tests by call-id, add and refine documentation around it  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-10-13 12:26:14 +02:00  
				
					
						
							
							
								 
						
							
								fe54762b93 
								
							 
						 
						
							
							
								
								fix tests to avoid pyc-caching and skip python2.4 which doesn't support "python -m" on packages.  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-10-06 09:40:14 +02:00  
				
					
						
							
							
								 
						
							
								eead8f9ab4 
								
							 
						 
						
							
							
								
								fix issue123 - new "python -m py.test" invocation.  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-10-05 17:52:32 +02:00  
				
					
						
							
							
								 
						
							
								29051458fc 
								
							 
						 
						
							
							
								
								fix issue 109 - sibling conftest.py files shall not be loaded.  
							
							... 
							
							
							
							also simplify / refine tests a bit.
--HG--
branch : trunk 
							
						 
						
							2010-10-04 16:19:01 +02:00  
				
					
						
							
							
								 
						
							
								a60e470573 
								
							 
						 
						
							
							
								
								fix a collection bug  where a: 🅱️ :c could not be resolved properly if  
							
							... 
							
							
							
							there are multiple 'b' nodes.
--HG--
branch : trunk 
							
						 
						
							2010-09-28 15:24:36 +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  
				
					
						
							
							
								 
						
							
								8f2b0d0889 
								
							 
						 
						
							
							
								
								test and fix for apipkg (also available in apipkg default branch)  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-08-01 20:43:02 +02:00  
				
					
						
							
							
								 
						
							
								677f7c0a6a 
								
							 
						 
						
							
							
								
								remove trailing whitespace everywhere  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-07-26 21:15:15 +02:00  
				
					
						
							
							
								 
						
							
								91880ffc19 
								
							 
						 
						
							
							
								
								adding three x-failing tests for issue88, issue93 and related issues  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-14 12:02:43 +02:00  
				
					
						
							
							
								 
						
							
								8ba2a98e11 
								
							 
						 
						
							
							
								
								allow to run py.test.cmdline.main() multiple times.  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-11 19:56:22 +02:00  
				
					
						
							
							
								 
						
							
								d93016d85f 
								
							 
						 
						
							
							
								
								remove the unused return value of fnmatch_lines  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-04-28 17:12:38 -05:00  
				
					
						
							
							
								 
						
							
								fe34a8a15a 
								
							 
						 
						
							
							
								
								a couple of more fixes/refinements for getting py.test to run better on jython/win32  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-04-21 03:50:03 -07:00  
				
					
						
							
							
								 
						
							
								030986dcc4 
								
							 
						 
						
							
							
								
								reduce usage of the global py.test.config which maybe should die or become less global at some point (along with py.test.ensuretemp)  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-01-13 18:04:58 +01:00  
				
					
						
							
							
								 
						
							
								5c27076d32 
								
							 
						 
						
							
							
								
								flatten test directory hierarchy and merge smaller into larger files  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-01-13 16:17:50 +01:00