Colton Myers
|
725e5c689f
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
|
2015-06-11 13:15:38 -06:00 |
|
rallytime
|
c82f135d2e
|
Disabled some flaky tests until we can figure out how to make them more reliable
|
2015-06-10 14:04:14 -06:00 |
|
Pedro Algarvio
|
a8ff8fa0b5
|
Py3 compatibility fixes
|
2015-01-30 22:25:11 +00:00 |
|
Pedro Algarvio
|
60f215f191
|
Add from __future__ import absolute_import
|
2015-01-30 22:25:04 +00:00 |
|
Colton Myers
|
56eae4783a
|
Merge branch '2014.7' into merge-forward-2015.2
|
2015-01-06 13:33:18 -07:00 |
|
Colton Myers
|
f6eae029f0
|
Merge branch '2014.7' into merge-forward-2015.2
Conflicts:
pkg/windows/installer/Salt-Minion-Setup.nsi
salt/grains/core.py
salt/minion.py
salt/modules/mongodb.py
salt/states/archive.py
salt/states/mount.py
salt/utils/master.py
salt/utils/schedule.py
salt/utils/thin.py
tests/jenkins-ng.py
|
2015-01-06 13:14:27 -07:00 |
|
rallytime
|
73ef44dd9f
|
Pylint fix for 2014.7 branch
|
2015-01-06 11:14:06 -07:00 |
|
Mike Place
|
0194fbe77c
|
Attempt to fix inconsintent VT test by preventing a spin
|
2015-01-05 13:35:02 -07:00 |
|
Mike Place
|
845546c009
|
Holiday lint
|
2014-12-29 11:27:05 -07:00 |
|
Mike Place
|
e5fb81970d
|
Attempt to fix inconsintent VT test by preventing a spin
|
2014-12-29 10:26:48 -07:00 |
|
Mike Place
|
a931dd63fe
|
Increasing sleep to see if it fixes vt test
|
2014-12-19 14:01:20 -07:00 |
|
Pedro Algarvio
|
e683619f9f
|
Having data left to read does not mean the process is alive
|
2014-10-13 17:19:42 +01:00 |
|
Pedro Algarvio
|
4470c0dc68
|
White-space lint fix
|
2014-10-12 04:29:59 +01:00 |
|
Pedro Algarvio
|
51479e4592
|
Include a test case in order to check for full output from VT
|
2014-10-12 03:37:08 +01:00 |
|
Pedro Algarvio
|
743c26e562
|
Instead of checking for a live process, check for unread data.
Add a unit test which tests proper behaviour.
Fixes #15941
|
2014-10-12 02:28:35 +01:00 |
|
rallytime
|
b891ef12f0
|
Skip test_vt_size unit test
|
2014-09-25 15:38:01 -06:00 |
|
rallytime
|
e34157c70b
|
Add skipIf import to fix the 2014.7 tests
|
2014-09-15 08:23:08 -06:00 |
|
Pedro Algarvio
|
a171a35c89
|
Disable test_issue_10404_ptys_not_released
Disabled until we can find out why this kills the tests suite with an exit code of 134
|
2014-09-14 23:54:38 +01:00 |
|
Thomas S Hatch
|
0577b4070b
|
lint fix
|
2014-07-25 10:21:31 -06:00 |
|
Pedro Algarvio
|
ea01af39b4
|
Skip test on Darwin after making an effort
|
2014-07-24 13:12:46 +01:00 |
|
rallytime
|
9b9a60efea
|
Skip vt_test in os x - still needs some work to run
|
2014-07-23 14:40:03 -06:00 |
|
Pedro Algarvio
|
6c7e39dfcd
|
Factor out into a function the current number of PTY's detection code
|
2014-07-23 19:43:18 +01:00 |
|
Pedro Algarvio
|
fa2149e1da
|
Allow the VT tests to run on OSX
|
2014-07-22 15:20:03 +01:00 |
|
rallytime
|
7bb5ef3773
|
Skip lxc tests if no lxc and skip failing vt_test if running osx
|
2014-07-21 17:11:20 -06:00 |
|
Pedro Algarvio
|
34fcf1da45
|
Test if we're closing open PTY's
|
2014-06-19 13:08:50 +01:00 |
|
Pedro Algarvio
|
4d7ca91424
|
Remove unnecessary :license: from file headers
|
2014-05-26 19:26:15 +01:00 |
|
Pedro Algarvio
|
4bbd0c512d
|
Too much white-space added.
|
2013-12-14 17:42:51 +00:00 |
|
Pedro Algarvio
|
82973662e9
|
Disable the VT test, the code ain't mature enough.
|
2013-12-14 17:37:06 +00:00 |
|
Pedro Algarvio
|
d8453a4b91
|
Make sure we can actually get the size of the terminal before trying.
|
2013-12-12 09:53:36 +00:00 |
|
Pedro Algarvio
|
b15b3237e9
|
Update self.args even if shell is not True
|
2013-12-11 14:23:11 +00:00 |
|