laerus
916999913e
Merge branch 'master' into pytest_migration
...
maybe a fix for test_environ conflicts
Conflicts:
tests/test_environ.py
2016-07-01 22:28:45 +03:00
laerus
bea8c62829
tests bugs fixing/test_parser & test_tools to go
2016-07-01 21:52:37 +03:00
Oleh Prypin
bc11ba78db
Test 'optional items' (format spec) in format_prompt
2016-07-01 19:07:20 +03:00
Oleh Prypin
fa91c6b21b
Drop the separate implementation of format_prompt
...
It was used only in one place and can be replaced with partial_format_prompt
2016-07-01 19:07:20 +03:00
laerus
b83906381e
test_parser incomplete
2016-07-01 17:50:01 +03:00
laerus
36c0bcfd42
test execer/xonsh_execer fixture in conftest
2016-07-01 15:43:16 +03:00
laerus
a05ca9b6af
'test_imphooks'
2016-07-01 13:52:44 +03:00
laerus
5aef18ccfb
'test_main'
2016-07-01 13:35:16 +03:00
laerus
f43ddcfe27
'revert test_parser'
2016-07-01 12:43:32 +03:00
laerus
320bb3b4da
'test_environ/lexer'
2016-07-01 12:42:07 +03:00
laerus
6476c8491a
test_tools repair
2016-06-30 23:00:00 +03:00
Konstantinos Tsakiltzidis
1527ba6728
'slowly migrating tools'
2016-06-29 19:28:39 +03:00
Konstantinos Tsakiltzidis
2f2f1622c9
'test_builtins'
2016-06-29 18:32:42 +03:00
Konstantinos Tsakiltzidis
cc9d558e75
'fixed conflicts'
2016-06-29 16:59:42 +03:00
Konstantinos Tsakiltzidis
ba6f63f143
Merge branch 'master' into pytest_migration
2016-06-29 16:58:08 +03:00
Morten Enemark Lund
6a0b9bd61d
Merge pull request #1357 from xonsh/sub
...
LazyObject getitem
2016-06-29 12:17:48 +02:00
Anthony Scopatz
3276d06f01
removed ENV
2016-06-28 20:22:11 -04:00
Paul Goelz
4a9ac0812f
Fix iglobpath test and pass sort_result parameters in a lot of places where they should always have been passed.
2016-06-28 22:34:30 +02:00
Paul Goelz
ad51990b2b
Realize many of scopatz' suggestions
2016-06-28 20:36:17 +02:00
Konstantinos Tsakiltzidis
6760c3dfc4
test_history/test_replay(buggy)
2016-06-28 13:47:35 +03:00
Konstantinos Tsakiltzidis
1dcb080a54
'partial test_replay'
2016-06-28 13:16:12 +03:00
Anthony Scopatz
55ec4d4afb
lazy object getitem
2016-06-27 20:53:10 -04:00
Konstantinos Tsakiltzidis
5ccec32e12
test_environ part1 / tools small refactor
2016-06-27 18:39:10 +03:00
Paul Goelz
42637011ac
Use normal assertions in tests
2016-06-26 22:25:32 +02:00
Paul Goelz
3cf38a7f65
Merge branch 'master' of https://github.com/xonsh/xonsh into sortglob
2016-06-26 22:15:03 +02:00
Paul Goelz
860b10707f
PEP8 in xonsh/tools and test/tools
2016-06-26 22:09:16 +02:00
Paul Goelz
9b768c54f6
Lookup GLOB_SORTED outside of globpath functions to improve testability
2016-06-26 21:44:18 +02:00
Konstantinos Tsakiltzidis
a48e53130b
test_aliases/test_dirstack
2016-06-26 02:05:26 +03:00
Konstantinos Tsakiltzidis
c2e2c74f4c
Merge branch 'master' into pytest_migration
2016-06-25 21:36:56 +03:00
Konstantinos Tsakiltzidis
fe6376f6d5
'removed xenv ambiguity'
2016-06-25 21:07:25 +03:00
Anthony Scopatz
e97d02db16
fixed conflict
2016-06-25 12:34:55 -04:00
Konstantinos Tsakiltzidis
2c6fb2e6f7
'need more fixtures'
2016-06-25 13:38:43 +03:00
Konstantinos Tsakiltzidis
28ec6ea977
'need more fixturesr'
2016-06-25 13:06:59 +03:00
Konstantinos Tsakiltzidis
daf3f89ae8
TODO list, conftest.py, some migrations
2016-06-25 01:15:48 +03:00
Konstantinos Tsakiltzidis
4d67a47f59
test_tools, almost complete
2016-06-24 23:51:55 +03:00
Konstantinos Tsakiltzidis
9ea4c7ac08
Merge branch 'master' into pytest_migration
2016-06-24 21:22:57 +03:00
Konstantinos Tsakiltzidis
329398ff9e
'test_tools part1'
2016-06-24 21:21:50 +03:00
Burak Yigit Kaya
eda60048b1
Extract CommandsCache to its own module
2016-06-24 20:27:28 +03:00
Konstantinos Tsakiltzidis
1e9aed31f4
'parametrize ftw'
2016-06-24 18:16:16 +03:00
Gil Forsyth
6d98baa7d0
Merge branch 'master' into pytest_port
2016-06-23 15:52:53 -04:00
Gil Forsyth
170d08f43f
uncomment tests (my bad)
2016-06-23 15:04:28 -04:00
Morten Enemark Lund
064e86825d
Better integration of the check_ast, check_stmts, check_xonsh, check_xonsh_ast assertion helpers
2016-06-23 20:16:58 +02:00
Morten Enemark Lund
ef04264a06
Add XONSH_ENCODING_ERRORS to TOOLS_ENV
2016-06-23 20:13:24 +02:00
Anthony Scopatz
9603611851
Merge pull request #1277 from laerus/xonsh-argument-fix-i1073
...
complain on invalid cli arguments
2016-06-23 12:25:37 -04:00
Gil Forsyth
af970448cb
make sure PATHEXT is available in windows test
2016-06-23 11:45:00 -04:00
Gil Forsyth
a05defc857
fix EnvPath test failures
...
EnvPath's `__getitem__` method calls `expandvars` which only performs
expansion if the ENV_VAR `EXPAND_ENV_VARS` is `True`. And since our
environments aren't bleeding over into the tests anymore, this wasn't
being set. So a quick mock env added in to the expansion tests and
we're good to go.
2016-06-23 10:25:42 -04:00
Gil Forsyth
2f4adb2cbe
fix skip error (no yield inside skipped functions)
...
note that pytest is a bit finicky about how it skips things. we can't
use the `yield check_ast, asdf, asdf` format within a skipped function
since it will still be parsed and in the case of python3.5 only syntax,
python3.4 barfs
2016-06-23 09:59:21 -04:00
Morten Enemark Lund
cdf9e43bae
Fix pytest skip
2016-06-23 14:46:15 +02:00
Paul Goelz
c4f0151c26
PEP8 and fix wrong docstring.
2016-06-23 12:43:44 +02:00
Konstantinos Tsakiltzidis
f40a6e3170
'escape 3.5 tests with if instead of skip'
2016-06-23 13:01:20 +03:00