Ch3LL
c13f37eee4
change service name depending on os
2017-10-26 11:44:38 -04:00
Ch3LL
1f77f3e6a3
add skipif logic for fallocate cmd
2017-10-26 10:09:33 -04:00
Ch3LL
34e2955445
add saltutil.refresh_pillar test
2017-10-25 15:56:49 -04:00
rallytime
8237f45a46
Add print_function to __future__ import list
2017-10-25 14:54:03 -04:00
Ch3LL
980c43ebc9
change skip message check to docker
2017-10-25 13:43:13 -04:00
Ch3LL
3955537609
change skip if check to docker
2017-10-25 13:40:58 -04:00
Ch3LL
aa8875a0e2
change service name to docker
2017-10-25 13:39:46 -04:00
Ch3LL
03b5c4bc6d
add spm integration tests for remove and build
2017-10-25 12:09:51 -04:00
Ch3LL
0a387c2ecd
fix pylint
2017-10-25 12:08:29 -04:00
Ch3LL
f383f05a93
Add SPM create_repo integration test
2017-10-25 12:06:08 -04:00
rallytime
055b0701de
Lint fix from sloppy merge conflict resolution
2017-10-25 11:58:44 -04:00
Eric Radman
d921e1e6cb
Report 'onlyif' and 'unless' conditions as true or false
...
Elide terminology "execution failed/succeeded" since the result of these
conditions does not indicate a failure in state execution. Instead
simply report the result of each condition.
2017-10-25 11:03:13 -04:00
rallytime
1c3cb5c6a4
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- .gitignore
- tests/unit/states/test_file.py
2017-10-25 10:04:08 -04:00
rallytime
8a1c575ae5
Update salt.utils.fopen calls to new salt.utils.files.fopen path
2017-10-25 09:59:04 -04:00
rallytime
28343f0120
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/git.py
2017-10-25 09:54:37 -04:00
Mike Place
bd75be24ca
Merge pull request #44253 from Ch3LL/spm_install
...
Add multiple spm integration tests
2017-10-25 15:36:02 +02:00
Mike Place
75ee1ebc50
Merge pull request #44254 from twangboy/win_fix_test_win_groupadd
...
Fix `unit.modules.test_win_groupadd` for Windows
2017-10-25 15:33:39 +02:00
Ch3LL
e5701b472d
Add state, grains and service proxy tests
2017-10-24 16:59:56 -04:00
Ch3LL
654071028b
change service to crond
2017-10-24 16:26:31 -04:00
Ch3LL
7911b4b3eb
Add service.status integration test
2017-10-24 16:25:19 -04: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
twangboy
609361bf48
Fix some lint errors
2017-10-24 09:27:39 -06:00
twangboy
7a3ff9387d
Mock the rest of the tests
2017-10-24 09:27:38 -06:00
Erik Johnson
5ce14df82c
Change how members are retrieved in win_groupadd
...
This is a solution that works for the other functions that interact with
group objects, making it a better overall solution to be used widely
in win_groupadd.
This also updates the mocking in the tests such that we use a more
comprehensive fake class, and more intelligent mocking of get_sam_name
using a lambda.
2017-10-24 09:27:38 -06:00
twangboy
6ab82394be
Set up mocking
...
Move the code that sets up the group object, computer object and gets
existing members out of the individual functions so they can be mocked
Mock the GroupObj
Mock the ComputerObj
Mock existing members
Still need to fix info, getent, and members
2017-10-24 09:27:37 -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
Ch3LL
9e2e785034
add spm tests to test runner
2017-10-24 10:33:53 -04:00
Łukasz Mierzwa
58b84c7f71
Fix test case when postgres extension is already present and test=true is passed
...
Currently test expects that if the extension is already present salt will indicate that it will create it (which won't really happen without test=true since the extension is present), state was fixed so now salt will return correct information with test=true so fix the test to follow correct behaviour.
2017-10-23 17:48:27 -07:00
Ch3LL
4729ccd32b
Add multiple spm integration tests
2017-10-23 17:13:32 -04:00
Nicole Thomas
4278a08e40
Merge pull request #44194 from vernondcole/saltify-create-with-wake-on-lan
...
add wake-on-LAN feature to saltify create
2017-10-23 10:46:21 -04:00
nicholasmhughes
fa1c442943
added support for location in file.line when using ensure
2017-10-23 10:40:35 -04:00
Nicole Thomas
304dd2529d
Merge pull request #44160 from gtmanfred/directory
...
add changes to test return
2017-10-23 10:35:20 -04:00
Nicole Thomas
2ccfaca66c
Merge pull request #44067 from eradman/check_file_meta
...
Check file attributes if lsattr(1) is installed
2017-10-23 10:30:58 -04:00
Erik Johnson
96891a062a
Merge pull request #44203 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-10-23 09:11:54 -05:00
Nicole Thomas
7374403eca
Merge pull request #44225 from eradman/test_btmp_wtmp
...
Mock open on /var/log/btmp and /var/log/wtmp
2017-10-23 09:51:46 -04:00
Eric Radman
10d13062ec
Mock open to /var/log/btmp and /var/log/wtmp
...
- btmp may not exist
- wtmp may not exist, or it may not contain ASCII data
Unbreaks tests on OpenBSD 6.2
2017-10-21 09:50:08 -04:00
Nicole Thomas
012477071f
Merge pull request #44071 from garethgreenaway/various_beacon_fixes
...
[develop] Various fixes to beacons
2017-10-20 11:06:27 -04:00
rallytime
3b9d02977d
Update deprecated salt.utils paths to new salt.utils.x paths
2017-10-20 10:48:37 -04:00
rallytime
2617cf851f
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/aptpkg.py
- salt/utils/win_functions.py
- tests/unit/states/test_mount.py
2017-10-20 10:44:29 -04:00
Nicole Thomas
c6d27ada51
Merge pull request #43843 from twangboy/win_unit_test_mount
...
Fix `unit.states.test_mount` for Windows
2017-10-20 10:27:25 -04:00
Daniel Wallace
a7d3d668f4
missed removing changes in the next test
2017-10-20 08:11:44 -06:00
Nicole Thomas
33ad43eec0
Merge pull request #44085 from kstreee/fix-inconsistent-exception-handling
...
Fixes inconsistent exception handling in rest_tornado.
2017-10-20 09:18:28 -04:00
Nicole Thomas
c700cd9c1e
Merge pull request #44162 from rallytime/jinja-test-imports
...
Reorder and group imports in jina template unit tests
2017-10-20 09:09:40 -04:00
Nicole Thomas
12980a6961
Merge pull request #43476 from Shados/ssh_known_hosts_improvements
...
Improvements to SSH known_hosts handling
2017-10-20 09:07:20 -04:00
Vernon Cole
d3769b3568
add saltify wake-on-lan and document it
2017-10-19 20:14:07 -06:00
Mike Place
2551454f6a
Add absolute_import
2017-10-19 18:26:08 -05:00
Eric Radman
6da4fd979b
Check file attributes in check_file_meta() if lsattr(1) is installed
...
lsattr/chattr is not installed on many Unix-like platforms by default,
including *BSD, Solaris, and minimal Linux distributions such as Alpine.
2017-10-19 18:38:12 -04:00
Mike Place
1e3abfea59
Merge branch 'develop' into various_beacon_fixes
2017-10-19 15:58:01 -05:00
Mike Place
cc2c99c94c
Merge branch 'develop' into fix-inconsistent-exception-handling
2017-10-19 15:53:24 -05:00
Mike Place
68ed8c21b2
Merge branch 'develop' into jinja-test-imports
2017-10-19 15:42:20 -05:00
Mike Place
75136152c1
Merge pull request #44187 from twangboy/win_fix_unit_test_daemons.py
...
Fix pickling errors on Windows
2017-10-19 15:36:50 -05:00
Mike Place
5ef124bf2d
Merge pull request #44171 from Ch3LL/spm_int
...
Add SPM Build Integration Tests
2017-10-19 14:49:13 -05:00
Mike Place
866a78a673
Merge pull request #44176 from vernondcole/simplify-saltify
...
Simplify saltify cloud driver
2017-10-19 14:37:17 -05:00
twangboy
a862e0bf2d
Remove unneeded import
2017-10-19 13:30:16 -06:00
twangboy
d78f27466d
Fix unit.states.test_mount for Windows
...
Use `os.path.realpath` to convert paths
Mock `os.path.exists`
2017-10-19 13:30:16 -06:00
twangboy
64d2e4f732
Fix pickling errors on Windows
...
Moves the 4 sub functions to the global scope
2017-10-19 11:50:23 -06:00
Nicole Thomas
f0175623ed
Merge branch 'develop' into ssh_known_hosts_improvements
2017-10-19 13:44:29 -04:00
Vernon Cole
4c8cd9c507
lint and comment fixes
2017-10-19 10:16:28 -06:00
Daniel Wallace
ac0b5ec440
fix test
2017-10-19 09:28:59 -06:00
Vernon Cole
2b4f69e1f8
remove unused parameter
2017-10-18 20:20:36 -06:00
Vernon Cole
cce7bc9719
add more unit tests
2017-10-18 20:06:14 -06:00
Benedikt Werner
4bfeb7f1d1
Fixed missing import
2017-10-19 03:17:16 +02:00
Gareth J. Greenaway
8bbb1088e8
Fixing lint.
2017-10-18 14:57:33 -07:00
Gareth J. Greenaway
1e312d1b59
Adding tests for _memdata, Linux & *BSD
2017-10-18 14:57:33 -07:00
Ch3LL
cd79e9444e
remove unneded kwarg
2017-10-18 17:21:52 -04:00
Ch3LL
1541376c4f
Add spm build test
2017-10-18 17:15:42 -04:00
twangboy
bb1d2eb85b
Skip tests that are failing on PAM eauth
2017-10-18 14:03:10 -06:00
rallytime
832aa3010c
Reorder and group imports in jina template unit tests
...
The imports were scattered around quite a bit, which made it hard
to see where multiple uses of salt/utils/* imports were being pulled
in.
This PR just adjusts the ordering so it's easier to see what is included
already for the future. (This is particularly useful for catching misuses
of salt.utils.__init__.py functions.)
2017-10-18 14:15:50 -04:00
kstreee
e210f12cb7
Fixes inconsistent exception handling in rest_tornado.
2017-10-19 02:22:23 +09:00
Benedikt Werner
77b948b00a
Skip shadow module unit test if not root or no shadow
2017-10-18 19:10:55 +02:00
Mike Place
990a454f99
Merge pull request #44153 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-10-18 10:51:14 -06:00
Nicole Thomas
255a20f0e7
Merge pull request #44123 from terminalmage/gitfs-singleton
...
Use one salt.utils.gitfs.GitFS instance per thread
2017-10-18 12:12:25 -04:00
rallytime
d712031a43
Update to_unicode util references to new stringutils path
2017-10-18 09:44:55 -04:00
rallytime
b8dc018178
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/opkg.py
- salt/utils/templates.py
- tests/unit/templates/test_jinja.py
2017-10-18 09:37:47 -04:00
rallytime
0311c2a4de
Replace salt utils import with correct salt.utils.files path
...
This fixes a couple of test failures in the develop branch and cleans up
a couple of formatting issues and import ordering.
2017-10-17 17:55:18 -04:00
Mike Place
71f2bc4776
Merge branch 'develop' into panos-2017-9-26
2017-10-17 15:19:48 -06:00
Daniel Wallace
319b811f2f
exclude module name checker for kitchen helpers
2017-10-17 15:18:19 -06:00
Mike Place
afcaa0c591
Merge pull request #43913 from twangboy/win_fix_test_jinja
...
Fix `unit.templates.test_jinja` for Windows
2017-10-17 15:09:04 -06:00
Mike Place
fc5754c6a1
Merge pull request #43917 from twangboy/win_unit_test_pillar
...
Fix `unit.test_pillar` for Windows
2017-10-17 15:06:45 -06:00
Daniel Wallace
5e47788756
move tests up a directory
2017-10-17 14:59:11 -06:00
Daniel Wallace
f55986c087
pylint
2017-10-17 14:59:11 -06:00
Daniel Wallace
2573a74ac1
environment variable logic
2017-10-17 14:59:11 -06:00
Daniel Wallace
37abb1d06a
working pytest run
2017-10-17 14:59:11 -06:00
Daniel Wallace
59beb39406
don't use junit-xml if xml path not set
2017-10-17 14:59:11 -06:00
Daniel Wallace
e4d497a293
should be self.env
2017-10-17 14:59:11 -06:00
Daniel Wallace
d6e48f7cde
limit wordpress tests to opensuse and centos
2017-10-17 14:59:11 -06:00
Daniel Wallace
869330d836
use log_level: warning
2017-10-17 14:59:11 -06:00
Daniel Wallace
5234f706c5
use_vt on DEBUG log level
2017-10-17 14:59:11 -06:00
Daniel Wallace
c35e413ec2
move destroy to tearDown
2017-10-17 14:59:11 -06:00
Daniel Wallace
e6432ee049
log junit for each suite and platform
2017-10-17 14:59:11 -06:00
Daniel Wallace
7410ffd92a
add first kitchen test
2017-10-17 14:59:10 -06:00
Daniel Wallace
b8c800e4a7
start adding kitchen to test suites
2017-10-17 14:59:10 -06:00
Mike Place
4809dd41c0
Merge branch 'develop' into gitfs-singleton
2017-10-17 14:16:28 -06:00
rallytime
74acaad46e
Refactor publish func in master/masterapi to use check_authentication
...
In a previous PR, the runner and wheel functions in master.py and masterapi.py
were refactored to reduce common code via the salt.auth.check_authentication
method.
The publish function also can utilize the check_authentication function in
master.py and masterapi.py.
Consolidation of this code will help us be able to differentiate between
authorization and authentication errors in the future.
2017-10-17 12:27:13 -04:00
Marc Koderer
c4d9684a90
Use correct mac prefix for kvm/qemu
...
Using the private mac range for vms makes it impossible to
distinguish between hypervisors.
Issues #44056
Signed-off-by: Marc Koderer <marc.koderer@sap.com>
2017-10-17 10:46:06 +02:00
Gareth J. Greenaway
a89c26c88e
Various fixes to beacons to handle situations when beacons are stored in pillar. Updating execution module to report that beacons stored in pillar can not be managed via module. Updating add function to ensure beacon is available before attempting to add it. Updaitng unit tests to include new beacon is available check.
2017-10-16 14:32:12 -07:00
