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
75,852 Commits 24 Branches 182 Tags 341 MiB
6a8046970e
Commit Graph

8664 Commits

Author SHA1 Message Date
rallytime
a782b00ee1 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/cloud/clouds/openstack.py
 2017-02-01 13:35:10 -07:00
Mike Place
cc9b69b6bc Merge pull request #39091 from terminalmage/update-test-valid-docs 
Run test_valid_docs in batches
 2017-02-01 12:09:04 -07:00
Erik Johnson
d76f0380d0 add debug logging for batch vars 2017-02-01 00:05:21 -06:00
Erik Johnson
b4afea2a25 Don't fail test if data is empty 
This keeps trimmed output from failing the test. We are still testing
with a specific module lower down in the test, so this doesn't reduce
our test coverage.
 2017-02-01 00:05:21 -06:00
Erik Johnson
909916c78e Run test_valid_docs in batches 
This test fails often due to being trimmed, thanks to
salt.utils.dicttrim trimming values > max_event_size.

This commit changes this test so that it runs sys.doc twice, ensuring
that the return from sys.doc (for now) is not trimmed.
 2017-02-01 00:05:05 -06:00
Erik Johnson
bcee3d1ef6 Move fileclient tests to tests/integration/fileserver/fileclient_test.py (#39081) 
Being in the root of tests/integration/, these were not being run in
jenkins and would only run if executed manually using the -n flag in
runtests.py.
 2017-01-31 13:44:50 -07:00
Mike Place
86b4b77bfe Merge pull request #39058 from sergeizv/fix-lvm-fullversion 
Fix salt.modules.linux_lvm.fullversion
 2017-01-31 12:01:12 -07:00
Sergei Zviagintsev
0f84ca2487 Add test for modules.linux_lvm.pvcreate on existing LVM PVs 
If all the devices submitted to pvcreate() are already initialized as
LVM physical volumes, pvcreate() should return True and no futher
actions should be made.
 2017-01-31 17:57:21 +01:00
Sergei Zviagintsev
3967992bfd Fix test for modules.linux_lvm.pvcreate 
pvdisplay() would be called by pvcreate() twice: firstly to check
whether a device is already initialized for use by LVM and then to
ensure that the pvcreate executable did its job correctly. The test
replaces pvdisplay() with a mock that always returns True and thus
pvcreate() would think that a specified device is already initialized
and exit. In the other words, instead of testing physical volume
initialization the test simulates a case with all the submitted
devices already initialized.

Fix it by replacing pvdisplay with a mock that returns False on the
first call (thus pvcreate thinks that a device is not a PV yet) and True
on the second call (after the pvcreate executable is called).
 2017-01-31 17:49:28 +01:00
Sergei Zviagintsev
fb7ef99838 Fix mock emulating lvm version 
'lvm version' produces multiline output whereas test_version and
test_fullversion use mocks with single-line output. Use real-life
'lvm version' output in those mocks instead.
 2017-01-31 16:22:38 +01:00
rallytime
76e95087fd Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-27 11:52:03 -07:00
rallytime
4b3ff0fe0f Skip the test_badload test until Jenkins move is complete 
Once this happens, we need to re-enable the test. The move over
should also allow us to upgrade the version of salt-testing that
is applied to the test VMs. Once this is complete, we can apply
the `@flaky` decorator to this test. (salt-testing must be a
version newer than the September release.)
 2017-01-27 09:51:30 -07:00
rallytime
fdaa5ac1b0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/master.py
  - salt/pillar/__init__.py
  - salt/utils/__init__.py
 2017-01-26 14:09:37 -07:00
Nicole Thomas
a6c6e47842 Handle changing "is_default" value in moto package for boto test mock (#38973) 2017-01-26 12:05:30 -07:00
Mike Place
3ec806c003 Merge pull request #38940 from isbm/isbm-sanitizers-fix-and-unit-test 
Isbm sanitizers fix and unit test
 2017-01-25 13:15:55 -07:00
Bo Maryniuk
a112b790fe Fix typo 2017-01-25 21:15:05 +01:00
rallytime
ee33a53a64 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - tests/unit/doc_test.py
 2017-01-25 09:43:12 -07:00
Bo Maryniuk
47a16916c3 Add unit test 2017-01-25 15:44:38 +01:00
Pablo Suárez Hernández
4311b0b6de Increasing timeouts for running integrations tests 2017-01-23 16:55:48 +00:00
Mike Place
ec59ae67c8 Merge pull request #38859 from alxwr/2016.11 
fix parsing of sockstat -4
 2017-01-23 09:47:22 -07:00
Mike Place
5fe6db6201 Merge pull request #38850 from techhat/stripcache 
Strip .p from cache file names
 2017-01-23 09:28:45 -07:00
Alexander Weidinger
30fe5641c7 fix parsing of sockstat -4 2017-01-22 02:06:25 +01:00
Joseph Hall
109cb62e76 Remove .p from test 2017-01-20 20:22:57 -07:00
Megan Wilhite
2786e209c6 add 2016.11.2 changelog to release notes (#38848) 2017-01-20 15:32:45 -07:00
Nicole Thomas
a275b9714e Merge pull request #38815 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-20 11:53:00 -07:00
Mike Place
efe1bf10e8 Merge pull request #38832 from terminalmage/issue38711 
archive.extracted: Identify symlinks when checking for incorrect types
 2017-01-20 11:36:14 -07:00
rallytime
ce6d1b103d Make sure we're using the opts dict mocking in parsers_test 
The additional call to parser.parse_args(args) negates the first
patch to running self.config_func. We want the opts that we set
up in the above test to patch the setup args when the parse_args
func is called. This updates the mock to work with better with
patch and removes the additional parser.parse_args call.
 2017-01-20 10:20:51 -07:00
Erik Johnson
d10c068e25 Update archive state unit tests to reflect symlinks in archive.list 2017-01-20 08:49:40 -06:00
Ch3LL
374dc1ab88 skip 2016.3.5 due to :doc: references 2017-01-19 16:14:22 -07:00
rallytime
315b2c8712 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/win_system.py
  - tests/unit/modules/win_system_test.py
 2017-01-18 14:16:45 -07:00
Mike Place
d14f0c64eb Merge pull request #38812 from rallytime/pyobjects-test 
Update pyobjects test to be a list
 2017-01-18 14:06:00 -07:00
Mike Place
23b8b47258 Merge pull request #38809 from twangboy/fix_hostname_2016.3 
Fix get_hostname to handle longer computer names
 2017-01-18 12:31:59 -07:00
rallytime
f3e84c1ab7 Update pyobjects test to be a list 
Refs the discussion in https://github.com/saltstack/salt/issues/21796#issuecomment-84454088
 2017-01-18 12:16:30 -07:00
twangboy
d57a51f9f9 Fix tests for get_hostname 2017-01-18 11:27:50 -07:00
Mike Place
1033bbdde8 Merge pull request #38808 from vutny/fix-38388 
Fix #38388
 2017-01-18 11:19:35 -07:00
Megan Wilhite
a8a6215663 refine the os detection in archive test (#38807) 2017-01-18 11:03:55 -07:00
Denys Havrysh
9bd203ffcc Fix #38388 
If `log_level_logfile` is not set explicitly it should inherit the
level set by `log_level` configuration option.
 2017-01-18 19:16:38 +02:00
Mike Place
e0bf700020 Merge pull request #38790 from cachedout/fix_pyobjects_test_typo 
Fix typo in pyobjects test
 2017-01-18 08:38:56 -07:00
Mike Place
a66afb5f0f
Fix typo in pyobjects test 2017-01-17 13:57:20 -07:00
rallytime
64d866f7ab Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-17 11:44:26 -07:00
Mike Place
bab3479a3c Merge pull request #38585 from rallytime/follow-up-38527 
Follow up to PR #38527
 2017-01-17 11:40:01 -07:00
Mike Place
4e6146f65f Merge pull request #38660 from techhat/cachedir 
Don't force salt.cache to use cachedir from opts
 2017-01-17 11:38:34 -07:00
rallytime
05587201b6 Pylint fix: add line at end of file 2017-01-17 10:26:43 -07:00
Joseph Hall
be55b57abf One last fix 2017-01-17 10:07:25 -07:00
Joseph Hall
fc24b24998 Add correct function name 2017-01-17 08:55:58 -07:00
rallytime
30e8a66fb0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2017-01-16 18:54:14 -07:00
rallytime
d24776f5e9 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/master
  - doc/topics/netapi/index.rst
  - salt/netapi/__init__.py
 2017-01-15 16:07:55 -07:00
Joseph Hall
380abd3744 Add cachedir args to tests 2017-01-15 14:46:35 -07:00
rallytime
4e1e45d640 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-13 14:45:36 -07:00
rallytime
b910499dbe Various follow up fixes 
Merge branch '2015.8.12_follow_up' into '2015.8'
 2017-01-13 14:40:17 -07:00