Commit graph

3869 commits

Author SHA1 Message Date
Konstantinos Tsakiltzidis
f40a6e3170 'escape 3.5 tests with if instead of skip' 2016-06-23 13:01:20 +03:00
Konstantinos Tsakiltzidis
c7aabbb3b5 'nose bleeds' 2016-06-23 12:48:01 +03:00
Konstantinos Tsakiltzidis
6ecaa4e3d0 'ON_MAC madness' 2016-06-23 12:33:26 +03:00
Konstantinos Tsakiltzidis
d0f5ae99b2 'fallack in test tools' 2016-06-23 12:28:31 +03:00
Konstantinos Tsakiltzidis
7dfec26dbe 'these bugs slip nose?' 2016-06-23 12:16:20 +03:00
Anthony Scopatz
0ba57c4035 fix alias preference issue 2016-06-22 22:46:48 -04:00
Gil Forsyth
f94f453cac Merge pull request #1281 from xonsh/shtty
typo for cygwin job control
2016-06-22 22:02:27 -04:00
Gil Forsyth
1f1a159dff Merge pull request #1319 from laerus/pytest_port
merge from master and replace some new nose test with pytest
2016-06-22 20:48:55 -04:00
Konstantinos Tsakiltzidis
d9cd2f4dbe 'small tests tools.py refac' 2016-06-23 03:46:35 +03:00
Konstantinos Tsakiltzidis
b329fffd39 setup_module on test_imphooks 2016-06-23 03:41:36 +03:00
Konstantinos Tsakiltzidis
673999e799 'new nose to pytest' 2016-06-23 03:30:55 +03:00
Konstantinos Tsakiltzidis
4b5119fc75 Merge branch 'master' into pytest_port 2016-06-23 03:02:39 +03:00
Konstantinos Tsakiltzidis
b55fcee067 'main isatty mock/typo' 2016-06-23 02:46:34 +03:00
Gil Forsyth
bd78cbffd4 more fixes for test skipping 2016-06-22 18:51:56 -04:00
Gil Forsyth
698193c5e2 update skip reason 2016-06-22 18:32:14 -04:00
Gil Forsyth
560ebb5b1d ugly hack on test_main and finish test_history 2016-06-22 18:28:07 -04:00
Gil Forsyth
6f4fc7564e cleanup and extra fixes 2016-06-22 18:23:36 -04:00
Gil Forsyth
4eff251964 remove all nose imports and calls everywhere 2016-06-22 18:06:44 -04:00
Gil Forsyth
de745dc1f6 remove spurious import and update test_main 2016-06-22 17:49:54 -04:00
Gil Forsyth
af70c5d493 denose test imphooks 2016-06-22 17:48:35 -04:00
Gil Forsyth
9fdc062427 update history tests to pytest 2016-06-22 17:41:13 -04:00
Gil Forsyth
7e254d681e change all skip syntax to pytest 2016-06-22 17:32:02 -04:00
Gil Forsyth
965c802eff port test_environ to pytest 2016-06-22 17:14:27 -04:00
Gil Forsyth
81ab922a12 port ast and contexts to pytest 2016-06-22 17:12:33 -04:00
Gil Forsyth
458e204cfc add quiet flag to pytest 2016-06-22 16:32:30 -04:00
Gil Forsyth
b3e2876fd2 Merge pull request #1315 from laerus/pytest_port
bb nose
2016-06-22 16:27:15 -04:00
Konstantinos Tsakiltzidis
aa163fbc0a 'replay/wizard' 2016-06-22 23:20:37 +03:00
Konstantinos Tsakiltzidis
201d068b72 'ptk history/multiline' 2016-06-22 23:17:33 +03:00
Gil Forsyth
b2981f2169 update travis and appveyor to run pytest (hopefully) 2016-06-22 16:17:04 -04:00
Konstantinos Tsakiltzidis
d4def76232 'lexer' 2016-06-22 23:12:11 +03:00
Konstantinos Tsakiltzidis
6d68b3a3e4 'inspectors/lazyjson' 2016-06-22 23:04:25 +03:00
Konstantinos Tsakiltzidis
3f110d5f62 'dirstack foreign_shells' 2016-06-22 22:57:50 +03:00
Konstantinos Tsakiltzidis
90fdda6908 test_builtins 2016-06-22 22:50:01 +03:00
Konstantinos Tsakiltzidis
8a0c447d96 test_aliases 2016-06-22 22:45:42 +03:00
Morten Enemark Lund
3e54527353 Merge pull request #1296 from xonsh/cc
Binary locate speedups
2016-06-22 18:09:43 +02:00
Gil Forsyth
2c26fcaa64 update setup and teardown calls. only 1 test failing 2016-06-22 11:41:06 -04:00
Gil Forsyth
7e19163e66 fix Env definition in test/tools.py 2016-06-22 11:33:03 -04:00
Gil Forsyth
39a0167c11 fix setup in test_contexts 2016-06-22 10:06:55 -04:00
Gil Forsyth
30831ce840 fix test_imphooks setup 2016-06-22 09:59:18 -04:00
Gil Forsyth
46f842dcbe Merge master and update setup syntax in execer test 2016-06-22 09:57:31 -04:00
Konstantinos Tsakiltzidis
6694025a4a 'cleanup' 2016-06-22 15:34:45 +03:00
Konstantinos Tsakiltzidis
8f2e6d32e8 tests for -D & -i/added .coverage in .gitignore 2016-06-22 11:35:24 +03:00
Konstantinos Tsakiltzidis
ac371166f1 '-D fix/cleanup' 2016-06-22 01:31:55 +03:00
Anthony Scopatz
3a320ea2a5 cache validator 2016-06-21 15:48:01 -04:00
Konstantinos Tsakiltzidis
b830da10d7 'typoz' 2016-06-21 22:20:16 +03:00
Konstantinos Tsakiltzidis
f72ee6936f 'minor change/more relevant test names' 2016-06-21 22:09:58 +03:00
Konstantinos Tsakiltzidis
7d955e35e9 'minor cleanup/prolly ready to be merged' 2016-06-21 21:57:44 +03:00
Anthony Scopatz
bf68a9f228 another article 2016-06-21 14:22:13 -04:00
Anthony Scopatz
a32638cbb4 Merge branch 'master' into cc 2016-06-21 14:20:13 -04:00
Anthony Scopatz
696de57702 another win fix 2016-06-21 11:50:04 -04:00