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

6824 Commits

Author SHA1 Message Date
Ronny Pfannschmidt 9b2753b302 Merge pull request #2687 from nicoddemus/use-py36-ci 
Use 3.6 as preferred Python 3 interpreter for CI
 2017-08-15 10:49:39 +02:00
Bruno Oliveira 5f17caa156 Merge pull request #2675 from RonnyPfannschmidt/mark-callspeck 
ensure callspecs contain the list of marks
 2017-08-14 20:33:16 -03:00
Bruno Oliveira e9bfccdf2d Merge pull request #2678 from jespino/fix/2676 
Add default values documentation for python_files, python_classes and python_functions
 2017-08-14 20:29:39 -03:00
Bruno Oliveira 7b5d26c1a8 Use py36 as preferred Python 3 interpreter for CI testing 2017-08-14 20:27:28 -03:00
prokaktus 98bf5fc9be Fold skipped tests with global pytestmark variable 2017-08-15 02:18:46 +03:00
Bruno Oliveira 362b1b3c4f Use tox release candidates in CI 
Fix #2683
 2017-08-14 19:19:20 -03:00
Ronny Pfannschmidt 5c0c1977e3 Merge pull request #2682 from pelme/getfuncargvalue-fix 
Use the correct stacklevel for getfuncargvalue() deprecation warning.
 2017-08-13 18:24:39 +02:00
Andreas Pelme 39331856ed Use the correct stacklevel for getfuncargvalue() deprecation warning. 
Fixed #2681.
 2017-08-13 14:59:33 +02:00
Jesús Espino dc9154e8ff Add default values documentation for python_files, python_classes and python_functions 2017-08-12 12:29:13 +02:00
Bruno Oliveira 021fba4e84 Update number of plugins on README and poiint to plugincompat link 2017-08-10 21:15:22 -03:00
Ronny Pfannschmidt eb462582af fix #2675 - store marks correctly in callspecs 2017-08-10 19:46:36 +02:00
Bruno Oliveira fd84c886ee Merge pull request #2671 from nicoddemus/release-3.2.1 
Release 3.2.1
 2017-08-09 17:15:21 -03:00
Bruno Oliveira e6020781f6 Merge pull request #2653 from felipedau/slow-sharing-note 
Add note on sharing the `slow` marker in the basic examples
 2017-08-09 08:18:26 -03:00
Felipe Dau acd3c4fbc4 Update changelog for #2653 2017-08-09 02:57:36 +00:00
Felipe Dau c847b83d56 Use `pytest_collection_modifyitems()` in the run/skip option example 2017-08-09 02:51:07 +00:00
Bruno Oliveira 45d2962e97 Preparing release version 3.2.1 2017-08-08 21:11:11 +00:00
Bruno Oliveira 8b322afcdb Make generated doc in simple.rst more reliable 
Sometimes `test_funcfast` would show up in the `setup` step in
the slowest test durations summary.
 2017-08-08 18:04:21 -03:00
Ronny Pfannschmidt 523bfa6151 Merge pull request #2667 from nicoddemus/py36-windows-workaround-error 
Fix windows console workaround error with non-standard io-streams
 2017-08-08 07:10:49 +02:00
Bruno Oliveira cc0f2473eb Fix windows console workaround error with non-standard io-streams 
Fix #2666
 2017-08-07 20:57:13 -03:00
Bruno Oliveira 76c55b31c6 Merge pull request #2630 from srinivasreddy/2591 
Fixed#2591: Replaced os.sep with '/' as it behaves differently on linux and windows.
 2017-08-06 11:19:10 -03:00
Srinivas Reddy Thatiparthy a0101f024e remove os.sep as it behaves differently linux and windows. 
* on linux it is '/'

* on windows it is '\'
 2017-08-05 23:21:43 +05:30
Ronny Pfannschmidt d5f4496bdf Merge pull request #2656 from nicoddemus/unittest-features 
Document which pytest features work with `unittest`
 2017-08-05 09:38:02 +02:00
Bruno Oliveira 37353a854e Implement suggestions by Raphael 2017-08-04 17:56:13 -03:00
Ronny Pfannschmidt 12e60956de Merge pull request #2655 from nicoddemus/terminal-collecting-glitch 
Fix small terminal glitch when collecting a single test item
 2017-08-04 14:10:45 +02:00
Bruno Oliveira 15cdf137d5 Document which pytest features work with `unittest` 
Fix #2626
 2017-08-04 07:44:04 -03:00
Ronny Pfannschmidt 9e62a31b63 Merge pull request #2650 from srinivasreddy/2642 
Fixed#2642: Convert py module references to six module
 2017-08-04 09:21:51 +02:00
Bruno Oliveira 2e33d9b35e Add changelog entry for using six for portability 2017-08-04 00:03:43 -03:00
Srinivas Reddy Thatiparthy dc563e4954 convert py module references to six module 2017-08-04 08:05:03 +05:30
Bruno Oliveira ad52f714a9 Fix small terminal glitch when collecting a single test item 
Fix #2579
 2017-08-03 20:57:46 -03:00
Florian Bruhin 8969bd43c9 Merge pull request #2646 from nicoddemus/issue-2644 
Properly escape test names when setting PYTEST_CURRENT_TEST environment variable
 2017-08-02 16:27:05 +02:00
Bruno Oliveira 7703dc921c Only skip null bytes before setting the environment variable 
As discussed, node ids have already been "ascii" sanitized by the
parametrization process
 2017-08-02 10:27:45 -03:00
Bruno Oliveira 1deac2e210 Properly escape test names when setting PYTEST_CURRENT_TEST environment variable 
Fix #2644
 2017-08-01 20:52:37 -03:00
Bruno Oliveira 02da156351 Merge pull request #2645 from alex/patch-1 
Tiny rst syntax fix
 2017-08-01 20:14:39 -03:00
Alex Gaynor 84061233ef Tiny rst syntax fix 2017-08-01 19:10:50 -04:00
Bruno Oliveira 40254b64e5 Merge branch 'master' into features 2017-08-01 19:35:56 -03:00
Bruno Oliveira 0a15edd573 Merge branch 'release-3.2.0' 2017-08-01 18:58:43 -03:00
Bruno Oliveira 51ebad76f2 Fix merge instruction after a minor/major release 2017-08-01 18:24:17 -03:00
Bruno Oliveira d2bca93109 Update grammar in changelog as requested 2017-08-01 18:01:22 -03:00
Ronny Pfannschmidt 6e7547244b Merge pull request #2636 from RonnyPfannschmidt/remove-preinit 
remove preinit, its no longer needed
 2017-08-01 05:22:41 +02:00
Ronny Pfannschmidt 333ec8ba5a Merge pull request #2638 from RonnyPfannschmidt/function-definition 
small code cleanups
 2017-08-01 05:21:21 +02:00
Ronny Pfannschmidt dcaeef7c10 take review comments into account 2017-07-31 22:21:09 +02:00
Bruno Oliveira 8a2e6a8d51 Fix linting 2017-07-31 16:49:30 -03:00
Ronny Pfannschmidt 74d536314f pytester: make pytest fullpath a constant 2017-07-31 18:18:53 +02:00
Ronny Pfannschmidt ceb016514b remove dead code - Node._memoizedcall 2017-07-31 18:18:26 +02:00
Ronny Pfannschmidt e90f876b34 remove the last own implementation of pytest_namespace 2017-07-31 13:48:25 +02:00
Ronny Pfannschmidt c68a89b4a7 remove preinit, its no longer needed 2017-07-31 13:44:05 +02:00
Bruno Oliveira 07dd1ca7b8 Preparing release version 3.2.0 2017-07-30 21:37:18 +00:00
Bruno Oliveira f1467f8f03 Merge remote-tracking branch 'upstream/master' into features 2017-07-30 18:08:24 -03:00
Bruno Oliveira 763c580a2a Merge pull request #2576 from maiksensi/feat/raise-not-implemented-for-lt-gt-in-approx 
#2003 Change behavior of `approx.py` to only support `__eq__` comparison
 2017-07-30 17:48:33 -03:00
Bruno Oliveira e1aed8cb17 Merge pull request #2490 from RonnyPfannschmidt/fix-580 
Test Outcomes as BaseException - fix #580
 2017-07-30 17:38:42 -03:00