rallytime
893196d3e6
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/conf.py
- salt/loader.py
- salt/modules/dockermod.py
- salt/modules/sensehat.py
- salt/utils/parsers.py
- tests/integration/cloud/providers/test_ec2.py
- tests/integration/modules/test_cp.py
- tests/integration/modules/test_groupadd.py
- tests/integration/spm/test_man_spm.py
- tests/integration/states/test_npm.py
- tests/unit/states/test_environ.py
2018-04-03 14:33:11 -04:00
Erik Johnson
bbfd35d3ea
Replace flaky SPM man test
...
This replaces a test that has been intermittently failing, and also
expands it to check for _all_ man pages.
2018-03-29 12:19:41 -05:00
rallytime
49e49ae51b
Mark 2 tests as flaky
...
- integration.spm.test_man_spm.SPMManTest.test_man_spm
- integration.ssh.test_state.SSHStateTest.test_state_running
2018-02-23 09:34:14 -05:00
rallytime
3c298afa72
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- salt/modules/pip.py
- salt/modules/reg.py
- salt/modules/win_pkg.py
- salt/runners/manage.py
- salt/states/pkg.py
- salt/transport/zeromq.py
- salt/utils/event.py
- tests/integration/modules/test_pip.py
- tests/integration/states/test_user.py
- tests/unit/grains/test_core.py
- tests/unit/states/test_archive.py
- tests/unit/utils/test_boto.py
2018-01-23 13:26:43 -05:00
Daniel Wallace
1f71f301ba
specify checking man page path
...
Without setting the man path, this would be checking that the installed salt
package used to bootstap has an spm man page, which is possible that it
doesn't, and also not what we want to check
2018-01-19 17:53:20 -07:00
rallytime
59076f5ee8
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- salt/client/ssh/wrapper/state.py
- salt/modules/yumpkg.py
2018-01-04 17:45:29 -05:00
Nicole Thomas
d0a3770035
Merge pull request #44930 from frogunder/man_spm
...
man_spm_test
2018-01-04 15:58:01 -05:00
Erik Johnson
f78c71bd6b
[PY3] Add unicode_literals to spm, queues, and rosters
2017-12-28 15:30:27 -06:00
rallytime
9ded5e1cbb
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- salt/config/__init__.py
- salt/grains/core.py
- salt/modules/win_lgpo.py
- salt/returners/mysql.py
- salt/states/libcloud_dns.py
- tests/integration/runners/test_runner_returns.py
- tests/unit/grains/test_core.py
2017-12-21 15:58:08 -05:00
Ch3LL
1bd7110a14
Fix spm big file build test to check /tmp
2017-12-20 14:40:10 -05:00
Frode Gundersen
48e6953e1f
fix_string_error
2017-12-14 22:40:59 +00:00
Frode Gundersen
c9fa4ed2a7
man_spm_test
2017-12-11 19:52:32 +00:00
rallytime
f26beffe48
Update old utils paths to new paths
2017-11-05 20:39:40 -07:00
Ch3LL
952c6bfea4
Include file size check for test_spm_build_big_file test
2017-10-31 18:18:37 -04:00
rallytime
6d2490f6a0
Fix lint failure on 2017.7 branch
2017-10-27 13:03:01 -04:00
Nicole Thomas
e16707c403
Merge pull request #44285 from Ch3LL/all_spm
...
add spm integration tests for remove and build
2017-10-26 17:20:09 -04:00
Ch3LL
1f77f3e6a3
add skipif logic for fallocate cmd
2017-10-26 10:09:33 -04:00
Ch3LL
03b5c4bc6d
add spm integration tests for remove and build
2017-10-25 12:09:51 -04:00
Ch3LL
f383f05a93
Add SPM create_repo integration test
2017-10-25 12:06:08 -04:00
Ch3LL
4729ccd32b
Add multiple spm integration tests
2017-10-23 17:13:32 -04:00
Ch3LL
1541376c4f
Add spm build test
2017-10-18 17:15:42 -04:00
