Commit Graph

969 Commits

Author SHA1 Message Date
Mike Place
cfc66b848e Merge pull request #35115 from cachedout/fix_state_sync
Sync before state tests
2016-08-02 02:46:50 -06:00
Mike Place
57e6ea5e51 Merge pull request #35064 from twangboy/int_tests_useradd
Add useradd integration tests for Windows
2016-08-02 01:59:33 -06:00
Jeffrey 'jf' Lim
8ab96d9b50 Remove integration tests for sys.list_{functions,modules} 2016-08-02 12:09:56 +08:00
Mike Place
b5e556f3a3 Sync before state tests 2016-08-01 18:26:18 -06:00
twangboy
8eb97d08be Remove whitespace 2016-08-01 14:08:52 -06:00
Jeffrey 'jf' Lim
17a230a2e5 Tighten up test_list_modules_with_arg: should include "assertNotIn" too 2016-07-31 02:16:45 +08:00
twangboy
8e83757c78 Fix test_add_user_to_group 2016-07-29 12:07:14 -06:00
twangboy
35017d7241 Add useradd integration tests for Windows 2016-07-29 11:30:34 -06:00
Mike Place
ec821510bf Merge pull request #34909 from twangboy/int_tests_beacons
Add check for admin on Windows, gated
2016-07-29 10:39:28 -06:00
twangboy
2cb5787bad Remove linux gate 2016-07-29 10:24:29 -06:00
twangboy
402901aff0 Add check for admin on Windows, gated 2016-07-29 10:20:45 -06:00
twangboy
1607da0841 Better fix 2016-07-28 09:48:09 -07:00
twangboy
5ca2f15664 Fix test_issue_1896... for Linux 2016-07-28 09:33:23 -07:00
twangboy
55cb909f68 Fix two more tests for Windows 2016-07-27 15:17:36 -07:00
twangboy
3da842cea3 Put import in the right place 2016-07-27 11:21:20 -07:00
twangboy
e74fd599ce Add missing import salt.utils.win_functions 2016-07-27 11:17:16 -07:00
Mike Place
28268208f9 Merge pull request #34937 from twangboy/int_tests_cp
Fix test_list_minion for Windows
2016-07-27 08:53:45 -06:00
Mike Place
847d8ea95f Merge pull request #34939 from twangboy/int_tests_git
Fix git integration tests for Windows
2016-07-27 08:44:35 -06:00
twangboy
d0a96181e6 Clarify lowercase checking 2016-07-26 10:39:54 -07:00
twangboy
3c0cf59565 Fix lint 2016-07-26 10:34:54 -07:00
Shane Lee
84e2e8b101 Fix grains integration tests for Windows (#34941) 2016-07-26 10:49:10 -06:00
Shane Lee
c4131c0afb Skip inode test in Windows (#34938) 2016-07-26 08:59:47 -06:00
twangboy
a5537ad6b9 Fix test_init, add lower 2016-07-25 16:11:36 -07:00
twangboy
e50ce384c0 Fix git integration tests for Windows 2016-07-25 15:45:11 -07:00
twangboy
0f74afc257 Fix test_list_minion for Windows 2016-07-25 14:49:32 -07:00
Mike Place
baee2f2558 Config test no longer applies to new test config 2016-07-22 18:59:31 -06:00
twangboy
ff1fbce6ae Add check for admin on Windows, gated 2016-07-22 15:53:17 -07:00
Erik Johnson
e9be937d8f Fix incorrectly-written test
This was testing to confirm incorrect behavior. We should not be having
a leading zero when the setuid/setgid bit is set in the mode.
2016-07-20 15:33:11 -05:00
rallytime
39bc093ee9 Merge branch '2016.3' into 'develop'
No conflicts.
2016-07-19 10:31:07 -06:00
Justin Anderson
b94e0dd95a ipset.long_range doesn't need a docstring 2016-07-18 10:32:32 -06:00
rallytime
8b8e2a1dc3 CLI Example doc additions to fix the sysmod test failure 2016-07-14 17:34:02 -06:00
rallytime
f20e78b534 Merge branch '2016.3' into 'develop'
No conflicts.
2016-07-14 15:35:21 -06:00
rallytime
bb2c43b52a Merge branch '2016.3' into 'develop'
No conflicts.
2016-07-14 14:10:10 -06:00
rallytime
0c566dce89 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-07-14 14:06:42 -06:00
Mike Place
50360263c5 Adjust the mine test a little bit to give it a better chance of success (#34647) 2016-07-13 16:51:28 -04:00
Justin Anderson
dd1559a599 Check that mysqladmin exists before running mysql integration tests. 2016-07-13 11:08:26 -06:00
Megan Wilhite
f6dfbac5ca add num_cpus grain to freebsd (#34565)
* add num_cpus grain to freebsd

* fix pylint
2016-07-13 11:40:09 -04:00
rallytime
86b7c71e09 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/glusterfs.py
  - salt/states/pkg.py
2016-07-07 13:37:58 -06:00
Justin Anderson
0460edb9e2 Arch linux does not have osrelease or osmajorrelease grains (#34453) 2016-07-05 15:34:41 -04:00
Collin Richards
9d14d130fa Fix pylint issues 2016-06-30 10:46:35 -05:00
Collin Richards
72d47a67c0 Modify interface from utc boolean to utc_offset
The system set/get date/time functions now have
a utc_offset instead of a utc boolean so the time
can be set based off of any timezone.
2016-06-29 18:25:26 -05:00
Collin Richards
0866ee850e Remove _linux_set_datetime backend
Instead only use the date program as the backend.  This is much more
portable.
2016-06-29 18:24:50 -05:00
Collin Richards
69f8dd96ae Remove posix arguments 2016-06-29 18:24:49 -05:00
rallytime
cc83fa151a Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/status.py
  - salt/utils/__init__.py
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_vpc_test.py
2016-06-28 17:34:27 -06:00
Ch3LL
693cc61aa4 add osmajorrelease to ubuntu and fix pylint 2016-06-27 16:32:21 -06:00
Ch3LL
2fc3e8a54b add osmajorrelease grain for raspbian 2016-06-27 14:45:09 -06:00
Mike Place
1e5da4ba8f Merge pull request #34286 from Ch3LL/add_key_module_test
Add test for key module
2016-06-27 10:09:13 -07:00
Ch3LL
5f302d8205 Add test for key module 2016-06-24 16:24:21 -06:00
rallytime
8479c45728 Merge branch '2016.3' into 'develop'
No conflicts.
2016-06-21 17:29:44 -06:00
rallytime
318c2ed6a1 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/salt.py
  - salt/modules/grains.py
  - tests/unit/modules/boto_vpc_test.py
2016-06-21 16:03:31 -06:00