valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
93,702 Commits 24 Branches 182 Tags 341 MiB
f14f4dae22
Commit Graph

13418 Commits

Author SHA1 Message Date
Erik Johnson
f14f4dae22
Add unit test for latin-1 fallback, multi-encoding 2018-08-03 18:38:08 -05:00
Erik Johnson
726dd4331f
Add integration test for latin-1 file diffs 2018-08-03 17:30:17 -05:00
Erik Johnson
2dd1f31d23
Use BASE_FILES instead of redundant STATE_DIR 2018-08-03 16:46:01 -05:00
Daniel A. Wozniak
f2e15e7f1d
Do not re-define tearDown 2018-08-01 15:11:29 -07:00
Daniel A. Wozniak
4f8a191a69
Remove unicode key pairs from environ after test 2018-08-01 14:28:57 -07:00
Nicole Thomas
a8376b537a
Merge pull request #48855 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-08-01 13:44:58 -04:00
rallytime
92c9317a25
Update old utils paths to use new paths 2018-07-31 18:20:35 -04:00
rallytime
15bfba7143
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/slsutil.py
  - salt/modules/win_timezone.py
  - salt/states/pkg.py
  - tests/integration/states/test_pkg.py
 2018-07-31 18:18:58 -04:00
Nicole Thomas
e23ba01cd2
Merge pull request #48830 from garethgreenaway/48659_file_grep_glob_fix 
[2018.3] Fixes to file.grep
 2018-07-31 17:30:03 -04:00
Nicole Thomas
05f2d65de3
Merge pull request #48853 from rallytime/bp-48850 
Back-port #48850 to 2017.7
 2018-07-31 16:21:48 -04:00
Nicole Thomas
8a1285239a
Merge pull request #48426 from garethgreenaway/46689_fixing_pkg_held_when_package_is_installed 
[2017.7] fixes to states/pkg.py
 2018-07-31 16:18:04 -04:00
rallytime
3c33ee554a
Skip tests in integration.shell.test_master 
Related to https://github.com/saltstack/salt-jenkins/issues/378

This is likely causing all of the flakiness we're seeing on test runs
when the master stops responding.

These tests should be in their own, isolated run, rather than with
the rest of the test suite.
 2018-07-31 15:22:34 -04:00
Nicole Thomas
2bacc23481
Merge pull request #48796 from Ch3LL/remove_su 
Remove fake su used in integration tests
 2018-07-31 13:08:53 -04:00
Gareth J. Greenaway
11cb86e6eb
General cleanup in pkg state, reducing duplicate code. Fixing the requires_salt_modules decorator, sys.doc was returning too much information for the event to handle. This change specifically calls sys.doc with the module name. 2018-07-31 09:46:05 -07:00
Gareth J. Greenaway
16fb6ae635
Make sure pkg.hold and pkg.unhold are available before running the test. 2018-07-31 09:46:05 -07:00
Gareth J. Greenaway
998651102d
Fixing a situation when a package is already installed via salt or manually and a state attempts to set that package to be held. Previously the holding/unholding logic was only being run against packages that were being installed. This change moves the holding logic outside and runs it against all desired packages. Adding a new test to test holding logic. 2018-07-31 09:46:05 -07:00
Gareth J. Greenaway
0791b0a03c
FileGrepTestCase tests back to 2018.3 2018-07-31 09:33:58 -07:00
Gareth J. Greenaway
2e01c55e7e
Fixing a bug that prevents specifying wildcards for filenames. 2018-07-31 09:33:58 -07:00
Daniel Wozniak
69f81214d1
Merge pull request #48714 from dwoz/state_echo_fix 
Always transfer bytes from fileserver roots
 2018-07-30 15:37:12 -07:00
Daniel A. Wozniak
ce3ed43dab
Always use unix line endings 2018-07-30 11:41:58 -07:00
Orlando Richards
66936b4f41 Changed string comparison in pip test to match new confirmation string - ref PR #47734. 2018-07-29 21:32:24 +00:00
Nicole Thomas
2e00939a6e
Merge pull request #48788 from Ch3LL/timezone_windows 
Add timzeone windows integration tests and fix get_zone
 2018-07-27 16:14:29 -04:00
Ch3LL
de95a6a215
add unused import to timezone test file 2018-07-27 15:42:35 -04:00
rallytime
487458ad4b
Update old utils paths to use new utils paths 2018-07-27 11:57:34 -04:00
rallytime
436510796f
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-07-27 11:44:07 -04:00
Erik Johnson
52fc1c955d
Simplify file contents in roots fileserver test 
This removes the need to hard code contents in the test. The roots
fileserver just reads from the file in binary mode, so we should be able
to do the same in the test to confirm the correct behavior of the roots
backend.
 2018-07-27 09:16:59 -05:00
Erik Johnson
b6f73e8e57
Remove trailing whitespace on what should be a blank line 2018-07-27 09:15:05 -05:00
Nicole Thomas
8e61f3dce0
Merge pull request #48742 from frogunder/45014 
add windows integration tests for states.file
 2018-07-27 09:57:26 -04:00
Ch3LL
d3b7f2cb18
Remove fake su used in integration tests 2018-07-27 09:36:23 -04:00
William Giokas
d4ca0e3a97
test: except for OSError only 2018-07-26 17:27:02 -04:00
Ch3LL
f09d1a2c7e
Add timzeon windows integration tests and fix get_zone 2018-07-26 16:44:55 -04:00
Frode Gundersen
f08058b043 Merge branch '45014' of https://github.com/frogunder/salt into 45014 2018-07-26 20:09:17 +00:00
Frode Gundersen
33c20c1ec0
fix tests 2018-07-26 20:04:51 +00:00
Nicole Thomas
6978ce5d1d
Merge pull request #48747 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-07-26 14:14:33 -04:00
Nicole Thomas
f2ef2d3ef6
Merge pull request #48752 from garethgreenaway/fix_state_file_all_integers 
[2018.3] Fix when state file is integers
 2018-07-25 11:03:01 -04:00
Daniel A Wozniak
a89019e956
Multiple windows test fixes 2018-07-24 23:09:14 -07:00
Gareth J. Greenaway
790801c67e
Fixing a case where the state module would fail if the state file being passed was all integers. Added a new tests for this edge case. 2018-07-24 14:00:37 -07:00
rallytime
4122da40b5
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/states/test_service.py
 2018-07-24 14:28:33 -04:00
Nicole Thomas
062fe7cccf
Merge pull request #48718 from garethgreenaway/48536_beacon_diskusage_fixes 
[2018.3] beacon diskusage fixes
 2018-07-24 13:45:25 -04:00
Nicole Thomas
e873621009
Merge pull request #48711 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-07-24 13:38:57 -04:00
Frode Gundersen
757fde70c6
Merge branch '2017.7' into 45014 2018-07-24 11:07:14 -06:00
Frode Gundersen
a7a914060d
add windows integration tests for states.file 2018-07-24 16:42:07 +00:00
Daniel Wozniak
04ab17a4d6
Merge pull request #48726 from dwoz/syslogtest 
Skip test when syslog not available
 2018-07-24 09:12:44 -07:00
Daniel A. Wozniak
6e7824266b
Windows compatible cp test 2018-07-23 23:27:29 -07:00
Daniel A. Wozniak
00f04cfd59
Skip test when syslog not available 2018-07-23 23:11:42 -07:00
Nicole Thomas
ce4e22224e
Merge pull request #48720 from Ch3LL/mac_file_path 
Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path
 2018-07-23 18:32:56 -04:00
Daniel A. Wozniak
95329acb1e
Fileserver transfers bytes 2018-07-23 13:24:47 -07:00
Ch3LL
01d25fae19
Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path 2018-07-23 15:02:27 -04:00
Ch3LL
f44a2fc349
Enable service if disabled before running state service tests 2018-07-23 14:05:31 -04:00
Gareth J. Greenaway
38a65e8fb3
Fixing test_diskusage_nomatch and test_diskusage_match_regex 2018-07-23 11:02:57 -07:00