Commit graph

456 commits

Author SHA1 Message Date
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
Morten Enemark Lund
d24beeea77 Merge pull request #1280 from VHarisop/path_expand
Added support for slices in EnvPath
2016-06-21 12:13:00 +02:00
VHarisop
5ca646cbd9
Added slicing tests for EnvPath 2016-06-21 00:52:09 +03:00
Gil Forsyth
76ee40c8af fixes for windows test failures
I don't think the `/dev/null` test is a) necessary or b) meaningful on
Windows.  And it should fail, if it's passed, since `/dev/null` isn't
writeable or creatable file on Windows (I think).

I believe that the second set of tests that I've changed also have
little to no meaning on Windows.
2016-06-20 15:37:14 -04:00
Morten Enemark Lund
b943731aa9 Fix some windows test errors 2016-06-20 00:09:51 +02:00
Anthony Scopatz
9fe05449c0 fixed tests 2016-06-18 12:42:21 -04:00
JohnLunzer
426b1ffec4 Merged with master. Alphabetized xonsh.tools import in test_tools.py 2016-06-17 13:25:36 -04:00
JohnLunzer
2d7274e01b Fixed silly whitespace issue 2016-06-17 10:15:52 -04:00
JohnLunzer
36f3ec6955 Merge xonsh master. Make hopefully final changes. 2016-06-17 10:11:59 -04:00
VHarisop
733c9bc25b
Added news entry, fixed conflict with master 2016-06-17 12:33:18 +03:00
Anthony Scopatz
706f2b60cc fixed merge conflict 2016-06-16 22:59:27 -04:00
Anthony Scopatz
f37514f4a7 Merge branch 'more_search' of https://github.com/adqm/xonsh into adqm-more_search 2016-06-16 22:51:27 -04:00
JohnLunzer
bcec54c1e0 Changes address previous round of review. Added tests and expanded tests for a few other validators. 2016-06-16 09:12:40 -04:00
adam j hartz
8ae42ec987 builtins 2016-06-16 01:01:23 -04:00
adam j hartz
9d2a7e8c12 add parser tests 2016-06-16 01:01:23 -04:00
adam j hartz
a241d7a962 fix bad merge 2016-06-16 00:59:57 -04:00
adam j hartz
638ad3a10a update tests 2016-06-16 00:59:57 -04:00
adam j hartz
2841c126df update tests, add some new tests 2016-06-16 00:59:57 -04:00
Anthony Scopatz
51f61ca5cb fixed history tests 2016-06-16 00:43:02 -04:00
Anthony Scopatz
ab9ef2bd47 some major fixes 2016-06-16 00:24:35 -04:00
JohnLunzer
09b4934775 Slew of changes which should address all issues brought up in the PR review. 2016-06-14 10:37:31 -04:00
VHarisop
2ce6bdd88d
Simpler constructor + don't resolve symlinks 2016-06-14 02:18:32 +03:00
VHarisop
46c83d6871
Refactored code, added TypeError for invalid init 2016-06-14 01:19:13 +03:00
JohnLunzer
cd07eb1b92 Fixed some bugs, updated tests 2016-06-13 10:41:43 -04:00
VHarisop
74b85d836a
EnvPath now handles bytes + pathlib.Path(s) 2016-06-13 04:23:05 +03:00
VHarisop
100c6d5797
Made EnvPath extend MutableSequence instead 2016-06-13 00:36:18 +03:00
Anthony Scopatz
c9d7389ba9 fixed up some test 2016-06-11 23:13:18 -04:00
JohnLunzer
5a3506c884 Merge branch 'master' of https://github.com/scopatz/xonsh into history-all 2016-06-11 21:24:09 -04:00
JohnLunzer
1687ac2f25 Bulk of work done. 2016-06-11 21:21:00 -04:00
adam j hartz
fdc73acfa7 merge from master 2016-06-11 21:08:32 -04:00
adam j hartz
4a53fb71cd add a few test cases 2016-06-11 21:02:28 -04:00
Morten Enemark Lund
791d4aeefe Merge pull request #1145 from VHarisop/traceback_file
Added file option for XONSH_SHOW_TRACEBACK
2016-06-11 16:25:03 +02:00
adam j hartz
78cb2206ba merge from master 2016-06-11 01:41:23 -04:00
adam j hartz
db39040b31 add tests for new callable list 2016-06-11 01:40:26 -04:00
adam j hartz
8e665439c0 update tests 2016-06-10 15:02:39 -04:00
VHarisop
b958cfa710
Fix conflict with master 2016-06-10 13:49:17 +03:00
Anthony Scopatz
2e2e39a540 increment line numbers on transformation 2016-06-10 02:50:56 -04:00
VHarisop
3aab92ded5
Added env.var to avoid ambiguity with traceback logging 2016-06-10 04:56:32 +03:00
Anthony Scopatz
d4c6a8054d branchg mods 2016-06-09 21:35:51 -04:00
Anthony Scopatz
e2c6a82ad9 fixed conflict 2016-06-09 02:58:44 -04:00
Anthony Scopatz
cc0f7f3033 Merge pull request #1185 from mitnk/fix-prompt-and-title
Fix crash caused by malformed prompt or title
2016-06-09 02:45:42 -04:00
Anthony Scopatz
51518756da merge and fix conflict 2016-06-09 01:44:34 -04:00
Hugo Wang
af55ed4049 fix crash caused by prompt exceptions 2016-06-09 11:44:50 +08:00
Hugo Wang
6dc835a9fd fix crase caused by malformed prompt or title 2016-06-09 10:51:50 +08:00
Anthony Scopatz
101f41511c added some laziness to commands cache 2016-06-07 22:12:02 -04:00
Gil Forsyth
74d4e6b892 change test setup syntax to match pytest 2016-06-07 15:53:38 -04:00