Commit Graph

10431 Commits

Author SHA1 Message Date
rallytime
8237f45a46
Add print_function to __future__ import list 2017-10-25 14:54:03 -04:00
rallytime
055b0701de
Lint fix from sloppy merge conflict resolution 2017-10-25 11:58:44 -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
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
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
Ch3LL
4729ccd32b
Add multiple spm integration tests 2017-10-23 17:13:32 -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
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
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
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
Daniel Wallace
ac0b5ec440
fix test 2017-10-19 09:28:59 -06: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
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
Matthew Summers
bebf301976
fixed test addressing issue #43307, disk.format_ to disk.format 2017-10-16 16:35:57 -04:00
Nicole Thomas
68974aa74d Merge pull request #44029 from msummers42/2017.7
addresses issue #43307, disk.format_ to disk.format
2017-10-16 15:59:19 -04:00
Nicole Thomas
9fe94d7843 Merge pull request #44098 from twangboy/win_mock_test_parsers
Return multiprocessing queue in LogSetupMock class
2017-10-16 14:14:29 -04:00
twangboy
a4e2d8059d
Fix unit.templates.test_jinja for Windows
Fix problem with files that end with new line on Windows
Fix some problems with regex
Fix some unicode conversion issues
2017-10-16 10:41:36 -06:00
Matthew Summers
16e1c1dfc8
fixed test addressing issue #43307, disk.format_ to disk.format 2017-10-16 09:47:40 -05:00
twangboy
caf086c05a
Skip Master, Minion, and Syndic parser tests 2017-10-13 16:02:01 -06:00
twangboy
cc43ca27af
Return multiprocessing queue in LogSetupMock class 2017-10-13 15:47:19 -06:00
Ch3LL
d2e91c33bd
Add spm shell tests 2017-10-12 15:31:48 -04:00
twangboy
00dbba5712
Fix unit.test_pillar for Windows
Use delete=True in NamedTemporaryFile command otherwise the handle to
the file isn't released and the file can't be opened by the actual test.
2017-10-10 13:44:58 -06:00
Erik Johnson
92e05cf1c0
Don't allow path separators in minion ID 2017-10-10 11:03:29 -04:00
Erik Johnson
19481423dd
Don't allow path separators in minion ID 2017-10-10 10:58:42 -04:00
twangboy
254dac7723
Fix unit.utils.test_utils for Windows
Use os agnostic path seps
Mock sys.platform to not return win
2017-10-05 16:47:32 -06:00
rallytime
eaca3291e2
Merge branch '2016.11' into '2017.7'
Conflicts:
  - tests/unit/modules/test_state.py
2017-10-05 12:09:40 -04:00
Erik Johnson
5d56a03a67
Improve failures for module.run states
Bare asserts are zero help in troubleshooting. This commit changes the
tests that uses bare asserts such that they fail with a useful error
mesage as well as the return data from the module.run call.
2017-10-02 10:48:45 -05:00
twangboy
fd1d6c31de
Fix unit.states.test_augeas for Windows
Mock `os.path.isfile` so the test will continue
2017-09-29 12:52:32 -06:00
Mike Place
6f687fdcff Merge pull request #43779 from twangboy/win_fix_test_state
Fix `unit.modules.test_state` for Windows
2017-09-28 16:27:02 +02:00
Mike Place
db0f569f7a Merge pull request #43782 from twangboy/win_fix_test_virt
Fix `unit.modules.test_virt` for Windows
2017-09-28 16:25:15 +02:00
Mike Place
5e29507c21 Merge pull request #43781 from twangboy/win_fix_test_status
Fix `unit.modules.test_status` for Windows
2017-09-28 11:06:18 +02:00