Anthony Scopatz
787469e415
some test fixes
2016-06-20 16:35:44 -04:00
Anthony Scopatz
f3508843bc
Merge branch 'master' into cc
2016-06-20 16:31:56 -04:00
Anthony Scopatz
fc4d4853c4
string sequences
2016-06-20 16:26:54 -04: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
Konstantinos Tsakiltzidis
ba87d4f46a
failing test for interactive + script case
2016-06-20 21:09:25 +03:00
Anthony Scopatz
9c10e61746
pathsep sets
2016-06-20 13:17:52 -04:00
Konstantinos Tsakiltzidis
f82cb4d88c
merged master/test for interactive script/failling
2016-06-20 19:27:53 +03:00
Konstantinos Tsakiltzidis
56055c9ade
Merge branch 'master' into xonsh-argument-fix-i1073
2016-06-20 18:58:26 +03:00
Morten Enemark Lund
b943731aa9
Fix some windows test errors
2016-06-20 00:09:51 +02:00
laerus
b61dc35cd2
Merge branch 'master' into xonsh-argument-fix-i1073
2016-06-19 16:01:50 +03:00
laerus
dfc48b6cab
more tests, fail atm
2016-06-19 05:20:53 +03:00
laerus
f25a868aca
tests/bugfix for file argument
...
if a script is passed as argument then
uknown arguments must be passed to the script
2016-06-18 20:14:05 +03:00
Anthony Scopatz
9fe05449c0
fixed tests
2016-06-18 12:42:21 -04:00
laerus
9ebd71c0c6
tests for invalid arguments:
...
these tests should be replaced with the pytest equivalents
after nose to test transition
2016-06-18 16:29:30 +03: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