valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
87,275 Commits 24 Branches 182 Tags 341 MiB
21359e69e8
Commit Graph

11405 Commits

Author SHA1 Message Date
Daniel Wallace
ce2733ef9a
upgrade including linux kernels 
This is required for ubuntu 14.04 to pass.
 2018-08-27 15:07:56 -04:00
Mike Place
a34ef2e54d
Matcher test marked flaky 2018-08-27 10:56:55 -06:00
Daniel Wallace
00b58ee438
Merge pull request #49337 from dwoz/win_service_test_fix 
Fix broken service stop test
 2018-08-27 09:22:37 -05:00
Daniel A. Wozniak
b9c344b7ce
Fix module.archive tests for win py3 2018-08-27 00:44:41 -07:00
Daniel A. Wozniak
ac60fb8190
Comment strange code 2018-08-27 00:44:40 -07:00
Daniel A. Wozniak
5fefd6fe89
Simplify cli test fixes 2018-08-27 00:44:40 -07:00
Daniel A. Wozniak
1765d53367
Fix archive tests on Windows platform 2018-08-27 00:44:39 -07:00
Daniel A. Wozniak
06f271ff19
Add archive module tests to whitelist.txt 2018-08-27 00:44:39 -07:00
Daniel A. Wozniak
9cb8fe28c5
Add more tests to whitelist for windows 2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
b8af2387cd
Fix indent wart 2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
bc971e419e
add doc tests 2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
8899a5ee1a
Add more client tests to whitelist 2018-08-27 00:44:37 -07:00
Daniel A. Wozniak
14cd7b4830
Add cli tests to whitelist 2018-08-27 00:44:37 -07:00
Daniel A Wozniak
3e55d10584
Platform module doesn't exist in 2017.7 2018-08-27 00:44:36 -07:00
Daniel A. Wozniak
2733c02b0a
Use double quotes on windows commands 2018-08-27 00:44:36 -07:00
Daniel A. Wozniak
0394ece642
The set command does not work like inline env vars 
Remove set command prefix on windows since it can not be run inline with
other commands.
 2018-08-27 00:44:35 -07:00
Daniel A. Wozniak
1c1727e8fd
Fix broken service stop test 2018-08-26 18:34:47 -07:00
Daniel A. Wozniak
19911987b7
Fix review nits 2018-08-26 17:03:16 -07:00
Daniel A. Wozniak
6abc2daf56
Re-factor dedent to fix warts 
- textwarp.dedent does not support bytes on py3
- make sure to preserve trailing newlines
 2018-08-24 10:46:50 -07:00
Daniel A. Wozniak
75b2e3d990
Use salt.utils.to_* functions 2018-08-24 09:35:02 -07:00
Daniel A. Wozniak
fa78a7b2ee
Add dedent that sets line endings 2018-08-24 09:35:00 -07:00
Michael Calmer
6224f7b551
calling range is going up to the upper limit but not including it 2018-08-23 13:08:04 -04:00
Mike Place
395bae6486
Merge pull request #49259 from gtmanfred/flaky-2017.7 
[2017.7] flaky tests
 2018-08-22 10:40:53 -06:00
Daniel Wallace
93a576ef63
flaky tests are flaky yo 2018-08-22 11:38:23 -05:00
Daniel Wallace
f518bd3efc
mark orchestration state tests as flaky 2018-08-22 11:37:43 -05:00
Daniel A Wozniak
72c37271a5
Use six to make sure content is unicode 2018-08-22 01:05:53 -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
Mike Place
0157eacffc
Merge pull request #49164 from terminalmage/issue49154 
Fix bug in keep_source for non-templated salt:// file sources
 2018-08-18 08:11:57 -04:00
Daniel A. Wozniak
913ea5ebde
Fix directory unit test 2018-08-17 14:07:19 -07:00
Daniel A. Wozniak
3363238ff6
Account for normalized dirs in unit tests 2018-08-17 13:17:08 -07:00
Mike Place
7043286d6c
Merge pull request #49143 from Ch3LL/bp-49142 
[2017.7] Backport #49142
 2018-08-17 16:40:39 +02: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
Daniel A. Wozniak
6844251315
Fix remaining file state integration tests (py3) 2018-08-16 19:57:39 -07:00
Erik Johnson
b4544d7f89
Add keep_source integration tests 2018-08-16 14:53:32 -05:00
Daniel A. Wozniak
3384864e8f
add Exception type 2018-08-16 11:57:28 -07:00
Daniel A. Wozniak
9da79dd0b5
Allow test suite to finish if tmp dir removal fails 2018-08-16 10:48:19 -07:00
Ch3LL
d2e73cc988
Remove -Z script_arg for cloud tests 2018-08-15 17:35:23 -04:00
Daniel A. Wozniak
c6b781eea5
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-14 11:43:21 -07:00
Daniel A. Wozniak
054afb8197
Multiple file state test fixes 
- Account for hash differences due to line endings
- Ignore tests that are not valid on windows
- Other test fixes due to line endings
 2018-08-13 12:29:25 -07:00
Gareth J. Greenaway
fc0817cb35
The osfullname grain differs when using Python2 vs Python3, swapping this out for the "OS" grain which is consistent. 2018-08-10 09:14:49 -04:00
rallytime
ed6fb8b739
Merge branch '2017.7.8' into '2017.7' 
No conflicts.
 2018-08-10 09:08:47 -04:00
Gareth J. Greenaway
fa2339bb91
The osfullname grain differs when using Python2 vs Python3, swapping this out for the "OS" grain which is consistent. 2018-08-09 17:12:06 -07:00
Ch3LL
0dedfae4d1
increase timeout on vultr cloud integration test 2018-08-09 17:33:56 -04:00
Nicole Thomas
c606a32cf2
Merge pull request #49042 from rallytime/flaky-jinja-test 
Mark a jinja template test as flaky
 2018-08-09 17:05:53 -04:00
rallytime
a43d9b4ba6
Mark a jinja template test as flaky 
Fixes https://github.com/saltstack/salt-jenkins/issues/1059
 2018-08-09 15:51:34 -04:00
rallytime
f08ee6c6ae
Update netapi client tests 
This change does 2 things:
- Skip 2 tests: they are not actually _testing_ anything, just running functions
  Let's skip these for now until we can dedicate some time to investigate what
  should be tested here. This will also help the tests breath a little bit.
- Add a small sleep to the async test. This test needs a little breathing room so
  the procs don't get stepped on. I think this is what is causing the master to
  shut down sometimes during test runs:

```
08:41:47          test_wheel_async (integration.netapi.test_client.NetapiClientTest)
08:41:47        [CPU:0.0%|MEM:13.2%]  ... 12:41:47,280 [salt.utils.process                         :670 ][ERROR   ] An un-handled exception from the multiprocessing process 'SignalHandlingMultiprocessingProcess-24' was caught:
08:41:47        Traceback (most recent call last):
08:41:47          File "/tmp/kitchen/testing/salt/utils/process.py", line 663, in _run
08:41:47            return self._original_run()
08:41:47          File "/usr/lib/python3.5/multiprocessing/process.py", line 93, in run
08:41:47            self._target(*self._args, **self._kwargs)
08:41:47          File "/tmp/kitchen/testing/salt/client/mixins.py", line 457, in _proc_function
08:41:47            salt.utils.daemonize()
08:41:47          File "/tmp/kitchen/testing/salt/utils/__init__.py", line 514, in daemonize
08:41:47            os.dup2(dev_null.fileno(), sys.stdout.fileno())
08:41:47        io.UnsupportedOperation: fileno
08:41:47        Process SignalHandlingMultiprocessingProcess-24:
08:41:47        Traceback (most recent call last):
08:41:47          File "/usr/lib/python3.5/multiprocessing/process.py", line 249, in _bootstrap
08:41:47            self.run()
08:41:47          File "/tmp/kitchen/testing/salt/utils/process.py", line 663, in _run
08:41:47            return self._original_run()
08:41:47          File "/usr/lib/python3.5/multiprocessing/process.py", line 93, in run
08:41:47            self._target(*self._args, **self._kwargs)
08:41:47          File "/tmp/kitchen/testing/salt/client/mixins.py", line 457, in _proc_function
08:41:47            salt.utils.daemonize()
08:41:47          File "/tmp/kitchen/testing/salt/utils/__init__.py", line 514, in daemonize
08:41:47            os.dup2(dev_null.fileno(), sys.stdout.fileno())
08:41:47        io.UnsupportedOperation: fileno
```
 2018-08-09 10:11:20 -04:00
rallytime
ca82b3d57a
Merge branch '2017.7.8' into merge-2017.7 2018-08-09 08:44:07 -04:00
rallytime
a9c16d9137
Fix test error in test_compiler jinja check 
The fix in #49002 was incomplete and when run on Debian, it hits a
`ValueError` when the RELEASE variable is a string with a decimal.
This change fixes the error.
 2018-08-08 18:29:14 -04:00
rallytime
c6f8429e41
Merge branch '2017.7.8' into '2017.7' 
No conflicts.
 2018-08-08 17:18:22 -04:00
Nicole Thomas
6b6d68c615
Merge pull request #49020 from rallytime/fix-grains-test 
Make grains integration test more robust
 2018-08-08 16:59:18 -04:00
Nicole Thomas
92d6c25c7f
Merge pull request #49002 from rallytime/skip-jinja-deep-error-test 
Skip test_jinja_deep_error on Debian 8
 2018-08-08 15:18:38 -04:00
rallytime
f72a3ac6be
Make grains integration test more robust 
The `test_grains_append_val_already_present` test can be flaky, especially on
CentOS 7 when it gets bogged down. Let's give the test a little breathing room
by adding a sleep so the grains.append calls don't stack up too quickly.
 2018-08-08 14:58:05 -04:00
Erik Johnson
0441cd56ef
Add optimization_order to mocking 2018-08-08 11:22:52 -05:00
Erik Johnson
a78663a301
Lint 2018-08-08 11:22:52 -05:00
Erik Johnson
764969ce08
Add a test to confirm that .py files are still loaded correctly 
Also, use USE_IMPORTLIB to gate testing on optimization_order, since
this only works with Python 3.5+.
 2018-08-08 11:22:52 -05:00
Erik Johnson
e7c10196da
Quiet the byte compiling for PY2 2018-08-08 11:22:52 -05:00
Erik Johnson
9338370477
Add unit tests for loader optimization levels 2018-08-08 11:22:52 -05:00
rallytime
1a23bb233f
Update expected return value in boto test 
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
 2018-08-08 10:42:57 -04:00
rallytime
23b66ef8bb
Skip test_jinja_deep_error on Debian 8 
This is a flaky test on Debian 8, so let's skip it for now.
 2018-08-08 10:36:56 -04:00
rallytime
d0136b1be5
Update expected return value in boto test 
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
 2018-08-08 09:16:55 -04:00
rallytime
df8699e2e7
Merge branch '2017.7.8' into '2017.7' 
No conflicts.
 2018-08-07 21:30:24 -04:00
Nicole Thomas
a1e54634dc
Merge pull request #48976 from rallytime/tornado 
Skip unreliable tornado tests
 2018-08-07 14:55:24 -04:00
Nicole Thomas
22713be9c1
Merge pull request #48979 from rallytime/bp-48959 
Back-port #48959 to 2017.7.8
 2018-08-07 14:11:52 -04:00
Nicole Thomas
5b2423e527
Merge pull request #48959 from rallytime/flaky-tests 
Mark some more tests as flaky
 2018-08-07 12:33:15 -04:00
rallytime
0bd838ab6c
Skip unreliable tornado tests 
Marked as flaky originally, but they're still flaky with undetermined
race-conditions. These are skipped in 2018.3 and forward, so let's skip
them here as well.
 2018-08-07 11:22:18 -04:00
Gareth J. Greenaway
3ce1b8a3c9
Update the elif block to only be true for versions below Debian 9. 2018-08-07 09:58:40 -04:00
Nicole Thomas
79994ecab4
Merge pull request #48962 from garethgreenaway/1022_test_service_disable_debian_part_deux 
[2017.7] Fixing tests/integration/modules/test_service.py
 2018-08-07 07:52:51 -04:00
Daniel Wozniak
1a1bda00cb
Merge pull request #48960 from dwoz/block_replace_tests 
Multiple block replace test fixes
 2018-08-06 16:01:25 -07:00
Gareth J. Greenaway
9e71551b36
Update the elif block to only be true for versions below Debian 9. 2018-08-06 15:11:55 -07:00
Daniel A Wozniak
94ac2b4fc7
Multiple block replace test fixes 2018-08-06 13:35:21 -07:00
rallytime
aaf986d728
Mark one grains test as flaky & convert to pytest notation 2018-08-06 15:03:27 -04:00
rallytime
e7e5abcf48
Mark 2 matcher tests as flaky 2018-08-06 14:47:44 -04:00
rallytime
668da57ab9
Mark some shell and runner integration tests as flaky 
In addition to marking these tests as flaky, the commit also updates
the affected tests to use pytest notation instead of unittest notation.
 2018-08-05 16:19:29 -04:00
Nicole Thomas
43649a68be
Merge pull request #48935 from garethgreenaway/1045_test_pkg_015_installed_held_centos 
[2017.7] Fix to test_pkg.test_pkg_015_installed_held
 2018-08-05 15:47:38 -04:00
Nicole Thomas
2421e2a570
Merge pull request #47100 from gtmanfred/ssh 
Allow for not being prompted to supply a password to deploy keys to a…
 2018-08-05 15:12:57 -04:00
Nicole Thomas
0bb10107b6
Merge branch '2017.7' into 1045_test_pkg_015_installed_held_centos 2018-08-05 14:12:26 -04:00
Gareth J. Greenaway
24d5e6a22f
Fixing the test_pkg_015_installed_held test to be able to successfully run on CentOS 2018-08-03 21:36:59 -07:00
Gareth J. Greenaway
280d1d2ad2
Fixing failing test, integration.modules.test_service.ServiceModuleTest.test_service_disable_doesnot_exist, on Debian 8 and higher. 2018-08-03 16:39:48 -07:00
Nicole Thomas
905da13653
Merge branch '2017.7' into cmd_win_tests 2018-08-03 15:10:29 -04:00
Nicole Thomas
f8bfab4f9f
Merge pull request #48890 from Ch3LL/cmd_test 
add sleep in test_cmd integration test
 2018-08-02 15:15:07 -04:00
Nicole Thomas
52722f6ded
Merge pull request #48885 from rallytime/flaky-tests-shadow 
Mark shadow module integration test as flaky
 2018-08-02 15:04:34 -04:00
Ch3LL
acda4ed9ab
add sleep in test_cmd integration test 2018-08-02 13:36:33 -04:00
Nicole Thomas
38d9eae537
Merge branch '2017.7' into flaky-tests-matchers 2018-08-02 13:29:57 -04:00
Nicole Thomas
0ca0b6f2f2
Merge pull request #48883 from terminalmage/salt-jenkins-1023 
Fix failing git worktree tests
 2018-08-02 12:51:39 -04:00
rallytime
da871a2d57
Mark shadow module integration test as flaky 
This test fails sometimes, so let's mark it as flaky.

I have tried to reproduce the failure and fix it, but to no avail.

Let's mark it as flaky for now.
 2018-08-02 11:12:35 -04:00
rallytime
3660dff13c
Separate compound matcher tests into individual tests 
When one match fails (and some of these can be flaky) the whole test fails.

This makes it somewhat difficult to track down why the test fails.

I am hoping we won't need the sleeps in this change when the tests are separate,
but let's see how that goes. It worked fine in my testing.

I also updated the test to use pytest notation, rather than unittest.
 2018-08-02 10:42:03 -04:00
Erik Johnson
c61f75cb50
Fix failing git worktree tests 
Git 2.18.0 changed the output format against which some of the asserts
in this test are performed. Instead of displaying the full path to the
worktree, it now references the branch name instead. This test updates
the asserts to look for the basename instead, which should allow it to
pass on Git releases both before and after 2.18.0.
 2018-08-02 09:26:27 -05:00
Nicole Thomas
a84f5155a1
Merge pull request #48869 from Ch3LL/mac_shell_tests 
Catch socket.error exception in testprogram
 2018-08-02 10:19:22 -04:00
Ch3LL
3734b1ec89
Catch socket.error exception in testprogram 2018-08-01 16:35:16 -04:00
rallytime
7320aa9104
Skip unreliable tornado test. 
Even with the flaky decorator, it still fails _sometimes_. This is not
a useful test as it sits. Skipping it for now.
 2018-08-01 15:46:03 -04:00
Ch3LL
9312a993a5
Add cmd module integration tests for windows and fix space in path issue 2018-08-01 14:05:52 -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
Daniel Wallace
5b443af7ae
add key-deploy test 2018-07-31 13:36:43 -05: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
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
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
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
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
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
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
rallytime
7332cce567
[2017.7] Mark some tornado tests as flaky 2018-07-23 12:53:26 -04:00
Nicole Thomas
801eae3b8d
Merge pull request #48672 from frogunder/45012 
add service enabled test
 2018-07-23 11:38:48 -04:00
Mike Place
689c231d2b
Merge pull request #48691 from Ch3LL/win_repo_pkg_test 
Add windows pkg module integration tests
 2018-07-22 14:01:29 -06:00
Ch3LL
4b7d6d80c5
Remove unnecessary jinja in curl.sls file 2018-07-20 14:32:14 -04:00
Nicole Thomas
85991680c8
Merge pull request #48345 from twangboy/fix_48169 
Fix behavior of powercfg module and state
 2018-07-20 13:37:12 -04:00
Ch3LL
2bedadfadb
Add windows pkg module integration tests 2018-07-20 12:47:37 -04:00
Nicole Thomas
96447ce541
Merge pull request #48656 from Ch3LL/windows_ip_mod 
Add windows ip module integration tests
 2018-07-20 10:57:44 -04:00
Nicole Thomas
ead19725b6
Merge branch '2017.7' into fix_48169 2018-07-20 10:45:59 -04:00
Nicole Thomas
1ebd96d909
Merge pull request #48664 from Ch3LL/srv_disable_mac 
[2017.7] Fix service.disabled test for macosx
 2018-07-20 10:32:55 -04:00
Nicole Thomas
33812f78f1
Merge pull request #48673 from Ch3LL/mac_port 
Use different pub and ret ports for testprogram integration tests
 2018-07-20 10:11:51 -04:00
Nicole Thomas
5f6a7c4d89
Merge pull request #48675 from Ch3LL/mac_disable 
Fix mac service.disable tests
 2018-07-20 10:09:40 -04:00
Ch3LL
c78efab828
Fix mac service.disable tests 2018-07-19 14:15:58 -04:00
Ch3LL
87dd85a220
Use different pub and ret ports for testprogram integration tests 2018-07-19 13:07:27 -04:00
Frode Gundersen
0747f2e58a
add service enabled test 2018-07-19 16:47:56 +00:00
Ch3LL
f1fbfad387
move the disable call up in try block 2018-07-19 10:32:21 -04:00
Ch3LL
f60d21bda4
reverse assertion order for service disable test 2018-07-19 10:29:18 -04:00
William Yardley
7ff3c9c5ff
Improve handling of npm json output (#43138) 
Rather than look for [ or { at the beginning of a line to identify the json
output, just use salt.utils(.json).findjson.
 2018-07-18 21:42:28 -07:00
Ch3LL
3727d1b3b9
switch try/except to match 2018.3 2018-07-18 18:05:17 -04:00
Ch3LL
fb953c2369
[2017.7] Fix service.disabled test for macosx 2018-07-18 17:58:44 -04:00
Ch3LL
90c3f568b1
Add windows ip module integration tests 2018-07-18 13:58:17 -04:00
Nicole Thomas
5391dd0a8d
Merge pull request #48584 from Ch3LL/mac_user_grp 
Fix grp import for mac in test_user integration test
 2018-07-16 15:28:12 -04:00
Nicole Thomas
61572b6780
Merge pull request #48555 from Ch3LL/ssh_id 
Fix state.sls_id not running on ssh minion
 2018-07-16 09:24:41 -04:00
Ch3LL
585ee9db90
Fix grp import for mac in test_user integration test 2018-07-13 16:25:28 -04:00
Nicole Thomas
aa6dcf39e8
Merge pull request #48583 from Ch3LL/mac_flaky_tests 
Add flaky decorator to mac_system and mac_timezone tests
 2018-07-13 15:56:39 -04:00
Nicole Thomas
6973152057
Merge pull request #48534 from xetix/fix-zypper-latest_version 
Fix behaviour of function latest_version in zypper module when multip…
 2018-07-13 15:56:05 -04:00
Nicole Thomas
9985f0b4c1
Lint: remove extra blank line 2018-07-13 15:55:08 -04:00
Ch3LL
4ba2299a87
import flaky decorator on mac tests 2018-07-13 15:16:06 -04:00
Ch3LL
811220b41e
Add flaky decorator to mac_system and mac_timezone tests 2018-07-13 14:40:26 -04:00
Daniel A Wozniak
136ddf5f54
Finally fix prepend for real 2018-07-13 11:25:27 -07:00
Daniel A Wozniak
66b25e65bf
Fix failing prepend test 
The prepend test is failing when jenkins runs kithchen but is passing in
my test environment. Make sure each test starts without the 'etc' path
existing.
 2018-07-12 19:04:47 -07:00
Patrik
5fbead8a36
Merge branch '2017.7' into fix-zypper-latest_version 2018-07-12 21:05:54 +02:00
xetix
db35d0c1e1 Adding testcase for this fix. 2018-07-12 20:58:16 +02:00
Daniel A Wozniak
c858bf477f
Remove which mock to get the test passing 
This test passes in my local kitchen tests when the which mock is
removed. However, I added this mock to try and get the test passing in
jenkins. The original failure that caused me to add it was removed from
jenkins. This will either fix the test or reveal the other error that
needs to be fixed.
 2018-07-12 11:14:47 -07:00
Ch3LL
f69932f506
fix pylint 2018-07-12 12:37:24 -04:00
Ch3LL
70e36764ee
Add more tests for salt-ssh state.sls_id 2018-07-12 12:16:33 -04:00
Nicole Thomas
ad5a959ab9
Merge pull request #48388 from garethgreenaway/48277_2017_7_file_roots_wrong 
[2017.7] reset file_roots for renderers after compile_pillar
 2018-07-11 09:13:45 -04:00