Daniel Wallace
1d0bd5bb32
Merge branch '2016.11' into 2016.11
2017-12-04 10:13:15 -07:00
Erik Johnson
153bf45b03
Fix regression in file.managed when source_hash used with local file
...
This ensures that we enforce the passed source_hash when the source is a
file local to the minion.
2017-12-03 00:01:44 -06:00
rallytime
1bbe1abeb2
Allow --static option to display state runs with highstate output
...
Fixes #44556
2017-11-28 13:10:37 -05:00
Erik Johnson
b4eb1527a6
Add test for PR 44335
...
This also modifies the virtual_subtype code slightly, due to an issue I
noticed in testing. We were reading from `/proc/1/cgroup` twice (once
for LXC, and then again for Docker).
2017-11-25 14:32:43 -06:00
Ch3LL
9ea4db4224
mock socket.getaddrinfo
2017-11-14 14:39:15 -05:00
Ch3LL
78a07e30f4
add more fqdn tests and remove some of the mocking
2017-11-14 11:39:35 -05:00
Ch3LL
5dbf4144ce
add ipv6 in opts
2017-11-14 11:39:35 -05:00
Ch3LL
eabc1b4f9c
Add fqdn and dns core grain tests
2017-11-14 11:39:31 -05:00
Mike Place
69a50204a6
Add newline for lint.
2017-11-13 11:16:33 -07:00
Gabe Van Engel
ef7b6bbb81
Fixed issue with file.line on Windows running Python 2.
...
The target file was being read as binary, but written as text, causing file.line to append an extra linesep on every line.
Added integration test to ensure file.line produces the expected content.
2017-11-12 23:55:35 -08:00
Gabe Van Engel
8f89c99fa5
Fix FileModuleTest setUp and tearDown to work on Windows.
2017-11-12 23:55:35 -08:00
Gabe Van Engel
b2b8f075b9
Fixed test to work on Windows.
2017-11-12 23:55:34 -08:00
Gabe Van Engel
5a5a2dd026
Added integration test for issue #41474
2017-11-12 23:55:33 -08:00
Sean Jenkins
ed8cccf457
#39901 : Fix pylint
2017-11-06 17:02:53 -07:00
Sean Jenkins
43c81dfdee
#39901 : Add unit tests
2017-11-06 15:04:22 -07:00
Daniel Wallace
56a3ad8f68
fix pylint comments
2017-10-24 12:18:27 -06:00
Daniel Wallace
4add666db1
add comment to Gemfile and move copyartifacts
...
moved copyartifacts.py to tests/support
Also added a comment to the Gemfile that this is only used to run the testsuite with kitchen-salt
2017-10-24 12:01:57 -06:00
Daniel Wallace
b4c8f7eb57
fix pylint
2017-10-24 10:44:25 -06:00
Daniel Wallace
79251287d0
add logging
2017-10-24 09:23:46 -06:00
Daniel Wallace
38963d5a82
use transport if not set in state_file
2017-10-24 09:23:46 -06:00
Daniel Wallace
7465f9b27a
add script for copying back artifacts
2017-10-24 09:23:46 -06:00
Nicole Thomas
304dd2529d
Merge pull request #44160 from gtmanfred/directory
...
add changes to test return
2017-10-23 10:35:20 -04:00
Daniel Wallace
a7d3d668f4
missed removing changes in the next test
2017-10-20 08:11:44 -06:00
Daniel Wallace
ac0b5ec440
fix test
2017-10-19 09:28:59 -06:00
Matthew Summers
bebf301976
fixed test addressing issue #43307 , disk.format_ to disk.format
2017-10-16 16:35:57 -04:00
Erik Johnson
19481423dd
Don't allow path separators in minion ID
2017-10-10 10:58:42 -04:00
Erik Johnson
5b3be6e8af
Fix failing unit test
2017-09-25 16:06:33 -05:00
Jochen Breuer
96f39a420b
Fixed linting
...
Fix for "String format call with un-indexed curly braces".
2017-09-20 16:35:01 +02:00
Jochen Breuer
08fba98735
Fixed several issues with the test
...
* Removed redundant import.
* No longer inheriting from LogSettingsParserTests.
* Replaced test class description with somethin meaninful.
* Fixed identation.
I've also moved the class to the bottom, since all the classes inheriting
from LogSettingsParserTests are in the block above.
2017-09-20 15:37:24 +02:00
Jochen Breuer
3a089e450f
Added tests for pid-file deletion in DaemonMixIn
...
This is a follow up on this PR:
https://github.com/saltstack/salt/pull/43366
Since we can get an OSError durin PIDfile deletion with non-root users, it
would make sense to also test for this. So here are the two test cases.
One with an OSError and the other one without.
2017-09-20 14:34:30 +02:00
Alessandro -oggei- Ogier
496f14a7e7
forgot to mock the proper one
2017-09-08 21:37:09 +02:00
Alessandro -oggei- Ogier
70642e495d
better qemu_static parameter mangle in deboostrap management, tests
2017-09-08 10:17:32 +02:00
Nicole Thomas
6106aec696
Merge pull request #43356 from gtmanfred/2016.11
...
never-download got readded
2017-09-07 13:46:04 -04:00
Nicole Thomas
3f19b247f3
Add handler.messages back in for test comparison
2017-09-07 11:51:39 -04:00
Nicole Thomas
5111cf8bad
Merge branch '2016.11' into 43086-no-member
2017-09-06 10:41:18 -04:00
Daniel Wallace
9911b04208
fix test
2017-09-05 13:52:02 -06:00
Mike Place
f16b7246e4
Merge pull request #43103 from aogier/43101-genesis-bootstrap
...
genesis.bootstrap deboostrap fix
2017-08-25 14:48:23 -06:00
Mike Place
5471f9fe0c
Merge pull request #43196 from gtmanfred/2016.11
...
Pin request install to version for npm tests
2017-08-25 12:43:05 -06:00
Daniel Wallace
ccd2241777
Pin request install to version
...
This fails on centos 6 because its node is too old to support the version of
hawk bumped here https://github.com/request/request/pull/2751 , we can still
test the functionality. This will pull from github, and install a specific tag
version, and we still do the uninstall using the github path.
This should be more stable.
2017-08-25 10:23:35 -06:00
Alessandro -oggei- Ogier
db94f3bb1c
better formatting
2017-08-24 15:07:08 +02:00
Alessandro -oggei- Ogier
e5cc667762
tests: fix a leftover and simplify some parts
2017-08-24 15:04:37 +02:00
Alessandro -oggei- Ogier
13e5997457
lint
2017-08-24 12:49:39 +02:00
Alessandro -oggei- Ogier
216ced69e5
allow comma-separated pkgs lists, quote args, test deb behaviour
2017-08-24 12:00:36 +02:00
Alessandro -oggei- Ogier
42a118ff56
fixed cmd composition and unified his making across module
2017-08-22 16:25:54 +02:00
Daniel Wallace
35e45049e2
use a ruby gem that doesn't have dependencies
2017-08-18 08:55:02 -04:00
garethgreenaway
2957467ed7
Merge pull request #43026 from rallytime/bp-43020
...
Back-port #43020 to 2016.11
2017-08-17 16:19:46 -07:00
garethgreenaway
51d16840bb
Merge pull request #42890 from DSRCorporation/bugs/42627_salt-cp
...
Make chunked mode in salt-cp optional
2017-08-17 11:37:43 -07:00
Daniel Wallace
0eb15a1f67
test with gem that appears to be abandoned
2017-08-17 14:28:39 -04:00
Erik Johnson
4089b7b1bc
Use socket.AF_INET6 to get the correct value instead of doing an OS check
...
This builds on #43014 with a more future-proof solution.
2017-08-17 12:12:27 -05:00
Ch3LL
b8eee4401e
Change AF_INET6 family for mac in test_host_to_ips
2017-08-17 10:55:53 -04:00
