valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
95,409 Commits 24 Branches 182 Tags 341 MiB
178dab3a4b
Commit Graph

138 Commits

Author SHA1 Message Date
Daniel A. Wozniak
b77db48d77
Fix test_managed_file_with_grains_data on Windows 2018-10-23 22:58:09 -07:00
Mike Place
b7d904f4bb
Merge branch '2018.3' into issue-49043 2018-09-30 09:18:54 -05:00
Daniel Wozniak
ed35633a1f Revert diff newline change 2018-09-28 17:06:36 -07:00
Daniel Wallace
cf5c179fd9
fix test_managed_file_with_grains_data 
Closes saltstack/salt-jenkins#1121
 2018-09-26 14:49:23 -05:00
Daniel A Wozniak
2a901e960d
Fix issue 49043 2018-09-25 23:27:28 -07:00
Daniel A. Wozniak
ed4de6385d
Fix file serialize test 2018-09-19 22:47:07 -06:00
Daniel A. Wozniak
4a54c7c164
Fix file serialize test 2018-09-19 11:21:13 -06:00
Nicole Thomas
e319ecc9f6
Merge pull request #49629 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.3 to 2018.3
 2018-09-13 10:00:07 -04:00
Gareth J. Greenaway
588f744493
Fixing failing test under python 3.7 causaed by changes to how os.makedirs sets initial permissions. 2018-09-12 14:25:57 -06:00
rallytime
b628ad729b
Merge branch '2018.3.3' into '2018.3' 
Conflicts:
  - tests/integration/states/test_file.py
 2018-09-12 12:35:00 -04:00
Nicole Thomas
e3a14e3535
Merge pull request #49594 from rallytime/bp-49580 
Back-port #49580 to 2018.3.3
 2018-09-10 15:59:40 -04:00
Gareth J. Greenaway
5fee38d1db
Fixes various tests that were failing under python 3.7. 2018-09-10 12:43:55 -04:00
rallytime
5de2245c11
Update old utils paths to use new utils paths 2018-09-10 09:14:24 -04:00
Gareth J. Greenaway
d2fb68c8ed
Fixes various tests that were failing under python 3.7. 2018-09-07 20:17:00 -07:00
Daniel A Wozniak
944f8e96c8
Use salt.utils to ensure string type 2018-08-31 10:21:14 -04:00
Daniel A. Wozniak
6399d035a4
Add dedent that sets line endings 2018-08-31 10:18:55 -04:00
Nicole Thomas
bcc5f1a7c1
Merge pull request #49444 from rallytime/bp-49299 
Back-port #49299 to 2018.3.3
 2018-08-30 14:10:20 -04:00
Daniel A. Wozniak
b8c5a5bb91
Fix string formatting wart in file state tests 2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
19756022be
Fix wart in file state test 2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
ba68388342
Work around cmd.run unicode issues in test for now 
Cat is missing on windows. I tired unsuccesfully to make this work with
the 'type' command on windows. This is maybe not ideal but it stablizes
the test suite for now.
 2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
5fe821978e
File state line ending fixes 2018-08-30 10:44:14 -04:00
rallytime
ab6cc1c741
Update old utils paths to use new paths 2018-08-28 11:41:38 -04:00
rallytime
ac406c49a7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/ext/win_inet_pton.py
  - salt/pillar/git_pillar.py
  - tests/integration/cli/test_batch.py
  - tests/integration/modules/test_archive.py
  - tests/integration/modules/test_pkg.py
  - tests/integration/states/test_file.py
  - tests/support/case.py
  - tests/whitelist.txt
 2018-08-28 11:22:47 -04:00
Daniel A. Wozniak
16ca5b9694
Work around listdir encoding issues on py2 windows 2018-08-28 09:24:16 -04:00
Daniel A. Wozniak
7650208dbc
file state test fixes 
- fix integration.states.test_file.FileTest.test_managed_latin1_diff
- fix integration.states.test_file.FileTest.test_recurse_issue_40578
- fix some issues integration.states.test_file.FileTest.test_issue_8947_utf8_sls,
  this test still fails due to py2 popen's unicode handling.
 2018-08-28 09:24:16 -04:00
Daniel A Wozniak
7513474f71
Use salt.utils to ensure string type 2018-08-25 12:19:59 -07:00
Daniel Wozniak
b47da0aff7
Merge pull request #49299 from dwoz/test_fix 
Work around cmd.run unicode issues in test for now
 2018-08-24 21:43:02 -07:00
Daniel A. Wozniak
f4bd644a4b
Fix string formatting wart in file state tests 2018-08-24 12:09:37 -07:00
Daniel A. Wozniak
fa78a7b2ee
Add dedent that sets line endings 2018-08-24 09:35:00 -07:00
Daniel A. Wozniak
e84e60857c
Fix wart in file state test 2018-08-23 21:00:35 -07:00
Daniel A. Wozniak
71d4465b6c
Work around cmd.run unicode issues in test for now 
Cat is missing on windows. I tired unsuccesfully to make this work with
the 'type' command on windows. This is maybe not ideal but it stablizes
the test suite for now.
 2018-08-23 16:21:20 -07:00
rallytime
196ce3f75e
Call the with_tempfile decorator correctly for 2018.3 2018-08-23 16:37:03 -04:00
rallytime
6f9a158661
Update old utils paths with new paths 2018-08-23 11:52:49 -04:00
rallytime
c3ecefc785
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/file.py
  - salt/modules/win_service.py
  - salt/states/mount.py
  - salt/states/service.py
  - tests/integration/__init__.py
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/unit/states/test_file.py
 2018-08-23 11:50:41 -04:00
Daniel A Wozniak
72c37271a5
Use six to make sure content is unicode 2018-08-22 01:05:53 -07:00
Daniel A. Wozniak
1679a19732
Work around listdir encoding issues on py2 windows 2018-08-21 21:53:12 -07:00
Daniel A Wozniak
1bf0b18224
Better blockfix replace 2018-08-21 16:15:11 -07:00
Daniel A Wozniak
dd4fcd3445
Revert "Multiple block replace test fixes" 
This reverts commit 94ac2b4fc7.
 2018-08-21 16:15:10 -07:00
twangboy
d3358423ae
Use os.linesep.join instead of textwrap.dedent 2018-08-21 16:15:07 -07:00
Daniel A. Wozniak
07ed84197d
file state test fixes 
- fix integration.states.test_file.FileTest.test_managed_latin1_diff
- fix integration.states.test_file.FileTest.test_recurse_issue_40578
- fix some issues integration.states.test_file.FileTest.test_issue_8947_utf8_sls,
  this test still fails due to py2 popen's unicode handling.
 2018-08-21 14:10:41 -07:00
Daniel Wallace
644ba3d34c
Merge pull request #49197 from dwoz/test_fix 
File state line ending fixes
 2018-08-20 13:45:03 -05:00
Daniel A. Wozniak
a7cfe355d7
File state line ending fixes 2018-08-19 13:09:23 -07:00
Daniel Wozniak
b3a247bfbb
Merge pull request #49172 from Ch3LL/bp-49118 
[2018.3.3] cherry pick #49118
 2018-08-17 13:54:04 -07:00
Daniel Wallace
a18d937156
Merge pull request #49167 from dwoz/filefix 
Fix remaining file state integration tests (py3)
 2018-08-17 13:36:03 -07:00
Daniel A. Wozniak
a1a298a13c
Simplify dict keys lookup 2018-08-17 11:45:07 -04:00
Daniel A. Wozniak
3d26affa10
Fix remaining file state integration tests (py3) 2018-08-17 11:45:07 -04:00
Ch3LL
ce5e17bdbd
update is_windows salt.utils to correct path 2018-08-17 11:40:50 -04:00
Daniel A. Wozniak
3fef112409
Multiple fixes for integration.states.test_file 
- Fix wart in PR #49087 file://c:\foo\bar vs c:\foo\bar local paths
- Finalize fix for test_issue_8343_accumulated_require_in
- Fix wart in PR #49088 Ignore proper directory test
 2018-08-17 11:36:40 -04:00
Mike Place
c2aba7abde
Merge branch '2017.7' into issue49154 2018-08-17 16:14:08 +02:00
Daniel A. Wozniak
b5ba073d65
Simplify dict keys lookup 2018-08-16 23:33:52 -07:00