Commit Graph

6571 Commits

Author SHA1 Message Date
Nicole Thomas
00f5fedf53 Merge pull request #31955 from jtand/merge-31926-with-fixes
Disable some boto tests causing issues in the test suite on 2016.3
2016-03-18 09:50:37 -06:00
Justin Anderson
ef2db9a301 Skipping some boto tests that are broken 2016-03-17 11:05:43 -06:00
Nicole Thomas
fb6d5fa44b Merge pull request #31946 from rallytime/merge-31886
Fix pylint for #31886
2016-03-17 09:45:10 -06:00
rallytime
98267ca100 Fix pylint for #31886
Merges #31886
2016-03-17 09:01:59 -06:00
Ch3LL
b761059405 add absolute_import 2016-03-16 20:58:41 -06:00
Pedro Algarvio
cb196803fd
Skip boto tests which are pegging CPU and eating all available RAM. 2016-03-17 01:01:24 +00:00
Pedro Algarvio
2fcc916c6a
Make sure all started processed, at least and as a last resort, are killed. 2016-03-16 19:40:49 +00:00
Pedro Algarvio
e1281e34cc
Don't assume the tests suite is running as root 2016-03-16 19:40:49 +00:00
Pedro Algarvio
916b6b402d
Skip tests if urllib3 is not installed 2016-03-16 19:40:48 +00:00
Ch3LL
5bcc5b2f21 fix pylint and remove super() 2016-03-16 11:44:55 -06:00
Mike Place
c28fc6e1d8 Merge pull request #31893 from Unity-Technologies/hotfix/windows-proxy-enable
Hotfix/windows proxy enable
2016-03-15 12:58:33 -06:00
Daniel Hobley
415cc8efab Make sure we enable the proxy settings on windows 2016-03-15 12:02:12 +01:00
Daniel Hobley
55f7ab1fba Fixed a bug where a cert was not correctly updated
If the certificate supplied had a different hash than the previous but the name was the same the change was ignored, this commit fixes that.
2016-03-11 11:52:15 -06:00
Ch3LL
3c03d9bd57 add mac_defaults test 2016-03-10 16:34:18 -07:00
rallytime
fe7ff0ebfa Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cloud/__init__.py
  - salt/returners/smtp_return.py
2016-03-10 13:13:35 -07:00
Nicole Thomas
75dfb2ed40 Merge pull request #31797 from Ch3LL/fix_pkginfo_test
Change pkg name to less for suse pkg.info_installed test
2016-03-10 12:08:16 -07:00
Ch3LL
910f0d9ffc change pkg name to less for suse 2016-03-10 11:18:44 -07:00
Justin Findlay
e46bac2d98 transport.tcp unit tests: disable hanging tests 2016-03-10 10:57:21 -07:00
Justin Findlay
992a8af726 renderers.gpg unit tests: mock gpg command 2016-03-10 10:57:21 -07:00
Justin Findlay
e0abe23c7e states.ssh int tests: run both test cases manually 2016-03-10 10:57:21 -07:00
Justin Findlay
d33b365984 states.pkg int tests: add pkgs for MacOS 2016-03-10 10:57:21 -07:00
Justin Findlay
431a247b66 states.cmd int tests: echo is more portable than true 2016-03-10 10:57:21 -07:00
Justin Findlay
7c48cf7ea6 states.user int tests: check MacOS primary group 2016-03-10 10:57:20 -07:00
Justin Findlay
5d5ce619b7 states.user int tests: disable GECOS for MacOS 2016-03-10 10:57:20 -07:00
Justin Findlay
aa61e1056f states.file int tests: find root's primary group 2016-03-10 10:57:20 -07:00
Justin Findlay
08493d85fd states.file unit tests: mark tests destructive for touching file 2016-03-10 10:57:20 -07:00
Justin Findlay
7a8061cc1e states.file unit tests: use existing file for unmocked tests 2016-03-10 10:57:20 -07:00
Justin Findlay
fe2fd3f993 modules.ps unit tests: check ps __virtual__ 2016-03-10 10:57:20 -07:00
Justin Findlay
eb2964d517 modules.mount unit tests: mock /etc/fstab 2016-03-10 10:57:20 -07:00
Justin Findlay
328d058f22 modules.linux_sysctl unit tests: mock ctl presence 2016-03-10 10:57:20 -07:00
Justin Findlay
590c0ad986 modules.btrfs unit tests: mock /proc/mounts 2016-03-10 10:57:20 -07:00
Justin Findlay
424a8b11bd modules.pw_group: mock (BSD) test to run on MacOS 2016-03-10 10:57:20 -07:00
Justin Findlay
2fe1160143 modules.mac_user.primary_group: add integration test 2016-03-10 10:57:19 -07:00
Justin Findlay
5905518ee5 modules.mac_user int tests: fix comment typo 2016-03-10 10:57:19 -07:00
Justin Findlay
fea37b303e modules.mac_user int tests: move common decorators to class 2016-03-10 10:57:19 -07:00
Justin Findlay
e53ae6c44e modules.useradd.primary_group: add integration test 2016-03-10 10:57:19 -07:00
Justin Findlay
ba19f395d1 modules.useradd int tests: disable testcase on nonlinux 2016-03-10 10:57:19 -07:00
Justin Findlay
ddea2361de modules.useradd int tests: move decorators to class 2016-03-10 10:57:19 -07:00
Justin Findlay
f69ab83623 modules.disk int tests: mtab not used on darwin 2016-03-10 10:57:19 -07:00
Justin Findlay
d818810200 modules.disk int tests: move decorators to class 2016-03-10 10:57:19 -07:00
Justin Findlay
bdb210dc13 modules.disk int tests: assert darwin disk usage 2016-03-10 10:57:19 -07:00
Justin Findlay
73ad02e917 modules.disk: run both integration test cases manually 2016-03-10 10:57:19 -07:00
Justin Findlay
0098c1c554 modules.blockdev test: mock utils.which 2016-03-10 10:57:19 -07:00
Justin Findlay
2f1c0cf809 shell tests: strip whitespace from shell return 2016-03-10 10:57:19 -07:00
Justin Findlay
c94dfb870f shell tests: comment on shell return data 2016-03-10 10:57:19 -07:00
Justin Findlay
34ba477b09 tests.runtests: configurable filehandle limits 2016-03-10 10:57:18 -07:00
Justin Findlay
3a77e7d383 tests.runtests: increase file limit for MacOS unit tests 2016-03-10 10:57:18 -07:00
Justin Findlay
4028d80eee tests...runtests_helpers: use system tmpdir 2016-03-10 10:57:18 -07:00
Justin Findlay
6b99798b1e tests.integration: use system tmpdir on darwin 2016-03-10 10:57:18 -07:00
Bo Maryniuk
ee1a002673 Update test case to cover SLE11 and SLE12 2016-03-10 13:26:15 +01:00