Commit graph

767 commits

Author SHA1 Message Date
Anthony Scopatz
ad05d89eda Merge pull request #1682 from laerus/testnews
better news testing
2016-09-06 10:59:41 -04:00
laerus
f0d4303bd6 'cleanup 2016-09-05 22:49:11 +03:00
laerus
2bec3decd4 more info on failure 2016-09-05 22:36:12 +03:00
laerus
1249aed7a2 fail on single graves 2016-09-05 21:27:06 +03:00
laerus
b45ad3a38c remove yield, shapeup 2016-09-05 14:33:42 +03:00
Bob Hyman
78d187fa6a merge from master 2016-09-04 22:16:17 -04:00
Anthony Scopatz
1c139047d6 some stuff 2016-09-02 19:57:25 -04:00
Anthony Scopatz
2e775ae98a remove test parser table creation 2016-09-02 19:51:48 -04:00
Bob Hyman
cd7b9c7e66 fix for #1667, cd <singleCharacter> fails 2016-09-02 13:51:35 -04:00
Anthony Scopatz
4f1cc49e37 resolved news conflict 2016-09-01 20:10:29 -04:00
Anthony Scopatz
6052a36531 Merge pull request #1657 from xonsh/fix_win_tests
Fix win tests
2016-09-01 19:39:36 -04:00
Anthony Scopatz
48ff3d3754 fixed conflict 2016-09-01 19:33:01 -04:00
Morten Enemark Lund
f1dab1a853 pep8 2016-09-01 12:47:35 +02:00
Morten Enemark Lund
bf10c20804 Merge pull request #1653 from xonsh/msubnest
Nested subporcess macros
2016-09-01 12:07:03 +02:00
Morten Enemark Lund
f8c8c519a3 Simplify code a bit 2016-09-01 12:03:55 +02:00
Morten Enemark Lund
87ec9e4c07 Disables win_unicode_console in tests if it is installed.
The packages collides with the pytest output capture and causes some tests to error.
2016-09-01 11:54:45 +02:00
Morten Enemark Lund
20032ecaa5 Skip dirstack_unc tests if drive letters are already used by windows 2016-09-01 08:53:45 +02:00
Morten Enemark Lund
05064a222d Merge pull request #1410 from bobhy/winuncpushd
Winuncpushd
2016-09-01 08:51:22 +02:00
Bob Hyman
33c68e3757 Merge branch 'master' into track_wd 2016-08-31 21:21:25 -04:00
Bob Hyman
13912e90b9 manual merge 2016-08-31 20:09:14 -04:00
Anthony Scopatz
a0e2d9a2d4 fixed conflicts 2016-08-31 01:37:14 -04:00
Anthony Scopatz
00afc3aff0 Merge branch 'msubnest' into mcont 2016-08-31 00:48:37 -04:00
Anthony Scopatz
a7e46b1dc7 Merge branch 'master' into msubnest 2016-08-31 00:47:48 -04:00
Anthony Scopatz
d392e9e9d6 fixed minor conflict 2016-08-31 00:21:27 -04:00
Anthony Scopatz
b2663358f5 nested subporcess macros 2016-08-30 21:04:03 -04:00
Konstantinos Tsakiltzidis
9754098e42 Merge pull request #1644 from xonsh/msub
Subprocess Macros
2016-08-31 04:00:07 +03:00
Konstantinos Tsakiltzidis
0b27499490 Merge pull request #1386 from xonsh/test_xsh
Collecting `test*.xsh` files when testing
2016-08-30 03:01:36 +03:00
Anthony Scopatz
c147feb884 Merge pull request #1640 from laerus/hist
History indexing API
2016-08-29 19:38:11 -04:00
Anthony Scopatz
e700027466 Merge branch 'master' into msub 2016-08-29 19:33:49 -04:00
Morten Enemark Lund
770a6f3864 Remove pytest plugin registration from conftest file. It is not necessary when registered in setup.py 2016-08-30 00:08:58 +02:00
Morten Enemark Lund
af232e47aa Flake 8 fixes 2016-08-29 21:24:14 +02:00
Anthony Scopatz
2f11ac657b Merge pull request #1648 from astronouth7303/vox-events
Add events to Vox
2016-08-29 13:09:24 -04:00
laerus
1b948bdb76 Merge branch 'master' of https://github.com/xonsh/xonsh into hist 2016-08-29 16:52:36 +03:00
laerus
295e04a7c4 typo 2016-08-29 13:46:22 +03:00
laerus
500963ae8b get_portions 2016-08-29 13:42:40 +03:00
Morten Enemark Lund
8e61cb5402 Add a simple xsh test file 2016-08-29 08:48:27 +02:00
Morten Enemark Lund
fe4e7af4bb Moved plugin from conftest to its own module 2016-08-29 08:48:26 +02:00
Morten Enemark Lund
7ff95bf6d7 Add an example test file 2016-08-29 08:47:57 +02:00
Morten Enemark Lund
07f9c50e7e Added framework for collecting and running *.xsh files with py.test 2016-08-29 08:47:56 +02:00
Anthony Scopatz
5f5aa2f45b trouble with xml block 2016-08-29 01:10:57 -04:00
Anthony Scopatz
e87021a585 enter_macro() call 2016-08-28 23:16:56 -04:00
laerus
a3c1dfd28e generators everywhere 2016-08-29 02:45:36 +03:00
Anthony Scopatz
2014f13f9a many suite tests 2016-08-28 16:17:51 -04:00
Anthony Scopatz
4589a4408d have simple version too 2016-08-28 16:06:01 -04:00
Anthony Scopatz
c2b9fd34b0 more tests and fixes 2016-08-28 15:30:44 -04:00
laerus
db8f5bc0d5 ensure_slice bug for 0 2016-08-28 22:26:50 +03:00
laerus
ffb4e5e035 docs/tests 2016-08-28 22:17:26 +03:00
Anthony Scopatz
c9a652a526 initially working with! 2016-08-28 15:13:03 -04:00
Anthony Scopatz
2a3254f387 some minor API changes 2016-08-28 13:46:05 -04:00
Jamie Bliss
0d791d1bea Add events to vox. 2016-08-28 13:37:23 -04:00