jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,755 Commits 2 Branches 0 Tags 34 MiB
Commit Graph

5755 Commits

Author SHA1 Message Date
Matthew Duck 999e7c6541 Tidy formatting of assertion truncation 
Part two of https://github.com/pytest-dev/pytest/issues/1512. Update the format
of the truncation message to help make it clear that pytest truncates the
entire assertion output when verbosity < 2.
 2016-09-19 15:27:38 +01:00
Matthew Duck dd64d823b9 Don't display dict common items if verbosity=1 
Part one of https://github.com/pytest-dev/pytest/issues/1512.

If verbosity=1, assertion explanations are truncated at 10 lines. In this
situation, it's more important to tell the user which dictionary items are
different than which are the same.
 2016-09-19 15:27:28 +01:00
Floris Bruynooghe dc16fe2bb9 Merge junit-xml url attribute branch 
Merge branch 'url_attr' of https://github.com/fushi/pytest into junitxml-url
 2016-09-19 12:57:05 +01:00
Floris Bruynooghe 5b260d80f9 Merge pull request #1883 from RonnyPfannschmidt/kill-memoized-call 
Kill memoized call
 2016-09-19 12:47:52 +01:00
Ronny Pfannschmidt 1c9bd9278e Merge pull request #1913 from flub/builtin-assertion 
Remove BuiltinAssertionError
 2016-09-05 16:53:13 +02:00
Floris Bruynooghe 28b1896e9a Remove BuiltinAssertionError 
We used to have this when we where patching the real Python
AssertionError for use with reinterpret, but reinterpret is now
gone so we no longer need this as it is not used by rewrite.
 2016-09-05 15:29:09 +02:00
Ronny Pfannschmidt e1674f60e7 remove memocollect anmd memoized_call 2016-09-05 14:41:28 +02:00
Ronny Pfannschmidt e572c16d3f remove memoizedcall in Module 2016-09-05 14:41:28 +02:00
Florian Bruhin 98ac1dd34b Merge pull request #1902 from nicoddemus/features 
Merge master into features after 3.0.2
 2016-09-02 06:35:44 +02:00
Bruno Oliveira f5d900d972 Merge remote-tracking branch 'upstream/master' into features 2016-09-01 23:07:49 -03:00
Bruno Oliveira 96a1d2941b Merge pull request #1900 from nicoddemus/finalize-3.0.2-release 
Finalize 3.0.2 release
 2016-09-01 23:05:39 -03:00
Bruno Oliveira ee284ec587 Set version to 3.0.3.dev0 
Also, using "dev0" as development suffix otherwise distutils gives a warning during "setup.py develop":

UserWarning: Normalizing '3.0.3.dev' to '3.0.3.dev0'
  normalized_version,
 2016-09-01 21:34:54 -03:00
Bruno Oliveira 927f411ee2 Fix release 3.0.2 release announcement list of authors 2016-09-01 21:28:30 -03:00
Bruno Oliveira 919f50a3bd Merge pull request #1896 from nicoddemus/release-3.0.2 
Release 3.0.2
 2016-09-01 21:19:50 -03:00
Bruno Oliveira 4e58c9a7d0 Fix use of deprecated getfuncargvalue method in the internal doctest plugin 
Fix #1898
 2016-09-01 07:19:11 -04:00
Bruno Oliveira a9f3053f72 Fix version typo in announce for 3.0.2 2016-09-01 06:59:31 -04:00
Bruno Oliveira d512e7f26b Run regendoc for 3.0.2 release 2016-08-31 20:32:05 -04:00
Bruno Oliveira f985f47a02 Fix reportingdemo call to pytest 2016-08-31 20:30:06 -04:00
Bruno Oliveira 4c45b93007 Changes for 3.0.2 release 2016-08-31 20:28:38 -04:00
Bruno Oliveira a094fb3aa6 Merge pull request #1890 from mbyt/disable_tearDown_and_cleanups_for_post_mortem_debugging 
unittest runner: avoid tearDown and cleanup to ease post mortem debugging
 2016-08-31 21:09:45 -03:00
mbyt e43d1174f7 spelling 2016-08-31 22:46:40 +02:00
mbyt 696a9112be integrating review commets of @nicoddemus 
plus small scale refactoring
 2016-08-31 22:33:47 +02:00
mbyt be08223d5a Merge branch 'master' into disable_tearDown_and_cleanups_for_post_mortem_debugging 
Conflicts:
	CHANGELOG.rst
 2016-08-31 20:35:31 +02:00
mbyt 10b3274924 adding corresponding test, authors and changelog 2016-08-31 20:22:54 +02:00
Florian Bruhin 67ba8aaaa2 Merge pull request #1891 from nicoddemus/find-spec-rewrite-hook 
Fix issue pytest_plugins as string was marking wrong modules for rewrite
 2016-08-31 05:23:33 +02:00
Bruno Oliveira edf8283bd8 Add CHANGELOG entry for #1888 2016-08-30 23:13:27 -03:00
Bruno Oliveira c8a366e551 Fix issue where pytest_plugins as string was marking wrong modules for rewrite 
Fix #1888
 2016-08-30 22:53:50 -03:00
Bruno Oliveira 9d2149d9c0 Merge pull request #1884 from pytest-dev/master 
merge master into features
 2016-08-30 18:47:57 -03:00
mbyt 4eeb475138 avoid tearDown and cleanup for unittest debugging 2016-08-30 21:55:49 +02:00
Bruno Oliveira 82218e4ee1 Merge pull request #1887 from mbyt/pdbcls_example_with_tab_completion 
pdbcls ipython example with tab completion
 2016-08-29 17:11:51 -03:00
mbyt 8593bb12ee pdbcls ipython example with tab completion 2016-08-29 21:15:12 +02:00
Raphael Pierzina e75078eae2 Merge pull request #1848 from pytest-dev/doc-warnings 
docs warnings as errors and initial page similar to README
 2016-08-26 23:02:28 +01:00
Bruno Oliveira 519f02b014 docs warnings as errors and initial page similar to README 
* Changed "index" to be more similar to the README (#1708).
* Fixes numerous issues like missing documents, syntax errors, etc (#1829, #432).
* Mention all docs in "contents.rst" so it's easier for users to locate (#1112).
* Add doc generation and checking to Travis and AppVeyor, to avoid re-introducing errors.

Fixes #432, Fixes #1112, Fixes #1708, Fixes #1829
 2016-08-26 17:47:18 -03:00
Florian Bruhin cb7c472e34 Merge pull request #1876 from nicoddemus/remove-monkeypatch-invocation-example 
Remove example of "monkeypatch" used in session scope
 2016-08-26 06:15:07 +02:00
Bruno Oliveira a947e83be9 Merge pull request #1870 from AiOO/bugfix/assertion-with-unicode 
Fix UnicodeEncodeError when string comparison with unicode has failed.
 2016-08-25 22:29:32 -03:00
Bruno Oliveira e92d373460 Remove example of "monkeypatch" used in session scope 
This is a leftover when invocation-scoped fixtures
were pulled back.

Fix #1872
 2016-08-25 21:50:57 -03:00
Ahn Ki-Wook 86b8801470 Update AUTHORS and CHANGELOG 2016-08-26 09:42:17 +09:00
Ahn Ki-Wook 856ad719d3 Fix UnicodeEncodeError when string comparison with unicode has failed. 2016-08-26 09:41:40 +09:00
John Towler 1b259f70f3 Testcase reports with a url attribute will now properly write this to junitxml 2016-08-25 13:08:51 -07:00
Ronny Pfannschmidt 9c45d6cd83 Merge pull request #1866 from joguSD/bugfix-stdin-stub-buffer 
Add buffer attribute to DontReadFromInput
 2016-08-25 07:07:44 +02:00
Jordan Guymon a152ea2dbb Add buffer attribute to stdin stub 2016-08-24 16:26:34 -07:00
Florian Bruhin 3345ac9216 Merge pull request #1861 from nicoddemus/ids-invalid-type-msg 
Improve error message when passing non-string ids to pytest.mark.parametrize
 2016-08-24 06:43:57 +02:00
Bruno Oliveira c5675d3efc Remove merge-conflict marker merged by accident 
Unfortunately rst-lint didn't catch that
 2016-08-23 23:43:05 -03:00
Bruno Oliveira 6359894fe4 Merge pull request #1859 from nicoddemus/merge-master-into-features 
Merge master into features
 2016-08-23 23:39:01 -03:00
Bruno Oliveira 972a5fb5d5 Improve error message when passing non-string ids to pytest.mark.parametrize 
Fix #1857
 2016-08-23 23:31:45 -03:00
Bruno Oliveira 7704f73db9 Merge branch 'master' into merge-master-into-features 2016-08-23 21:36:42 -03:00
Bruno Oliveira ea0febad28 Updates for new patch version 3.0.2 2016-08-23 21:33:57 -03:00
Bruno Oliveira ecb20b96fc Merge pull request #1856 from nicoddemus/release-3.0.1 
Changes for 3.0.1 release
 2016-08-23 21:21:24 -03:00
Bruno Oliveira 49fc4e5e4c Changes for 3.0.1 release 2016-08-23 18:15:43 -04:00
Florian Bruhin 3c866e7080 Merge pull request #1855 from nicoddemus/fix-empty-parametrize-ids 
Fix internal error when parametrizing using and empty list of ids()
 2016-08-23 23:38:27 +02:00