16 commits

Author	SHA1	Message	Date
enkore	0c959cb67a	pytest 2 compat	2016-12-17 15:58:51 +01:00
Marian Beermann	a9db2a2e55	Merge branch '1.0-maint' into master ... # Conflicts: # src/borg/archive.py # src/borg/archiver.py # src/borg/helpers.py	2016-12-17 13:26:28 +01:00
Thomas Waldmann	04340ae8b1	pytest: only rewrite the testsuite, fixes #1938 ... do not rewrite the borg application code, just the test code, so the bytecode tested is identical / very close to the bytecode used in practice.	2016-12-15 03:02:06 +01:00
Thomas Waldmann	c855c687eb	Merge branch '1.0-maint'	2016-12-14 03:33:53 +01:00
Thomas Waldmann	c6017abfb7	get back pytest's pretty assertion failures, fixes #1938	2016-12-13 19:27:01 +01:00
Marian Beermann	960c42193a	fix tox build for environment-python != containing-python in yet-another instance ... this instance: the repository worktree is *not* named borg. Cherry pick of 4f1157c into 1.0-maint due to f3efcdb TODO removed since we already did that after 1.0-maint, but 1.0-maint will never receive the change.	2016-11-13 11:20:00 +01:00
Thomas Waldmann	2679963cb9	add conftest.py hack needed for borg 1.0.x	2016-10-14 04:42:13 +02:00
Thomas Waldmann	f3efcdbd2e	point XDG_*_HOME to temp dirs for tests, fixes #1714 ... otherwise it spoils the user's nonces and cache dirs with lots of files. also: remove all BORG_* env vars from the outer environment fix get_*_dir tests to use monkeypatch.	2016-10-14 00:46:43 +02:00
Thomas Waldmann	4e4847ccce	point XDG_*_HOME to temp dirs for tests, fixes #1714 ... otherwise it spoils the user's nonces and cache dirs with lots of files. also: remove all BORG_* env vars from the outer environment	2016-10-13 23:59:28 +02:00
Lee Bousfield	b86b5d952a	Filesystem feature detection and test skipping	2016-07-31 01:19:31 -04:00
Thomas Waldmann	045e5a1203	Merge branch 'master' into move-to-src	2016-05-30 19:38:16 +02:00
Marian Beermann	478a6f29b6	Lower PBKDF2 iteration count for the tests ... This cuts testing time to about one third for me.	2016-05-25 22:29:57 +02:00
Marian Beermann	4f1157c3a4	fix tox build for environment-python != containing-python in yet-another instance ... this instance: the repository worktree is *not* named borg.	2016-05-24 20:58:12 +02:00
Thomas Waldmann	24204b181b	remove conftest sys.path hack, fixes #1072 ... not needed any more as the code is now below src/.	2016-05-21 19:18:54 +02:00
Marian Beermann	43258abf21	Fix tox	2016-05-18 17:08:49 +02:00
Marian Beermann	805f63167c	Translate Linux fsflags to BSD flags and vice versa	2016-05-18 00:22:53 +02:00