Commit Graph

15150 Commits

Author SHA1 Message Date
Gareth J. Greenaway
5cf6a1400d
Merge branch '2018.3' into merge-fluorine 2018-11-19 10:48:06 -08:00
Gareth J. Greenaway
dcae2f08c4
Merge branch '2018.3' into 50266_core_virtual_grain_fixes 2018-11-16 14:48:33 -08:00
Mathieu Parent
12ea1cc01e
git_pillar: Add tests for mountpoint parameter
(cherry picked from commit 6e2f4e471d08fcc29ce144af6dcd605b85644522)
2018-11-16 06:07:24 +01:00
Mathieu Parent
fce467e438
git_pillar: Add tests for root parameter
(cherry picked from commit 2e88b74816)
2018-11-16 06:07:24 +01:00
Mathieu Parent
ba150a5182
Don't fail on git_pillar tests when destructive tests are not enable
This fixes the following when running `python tests/runtests.py --ext-pillar`:

 --------  Tests with Errors  ------------------------------------------------------------------------------------------------------------------------
   -> tearDownClass (integration.pillar.test_git_pillar.TestGitPythonSSH)  ...........................................................................
       Traceback (most recent call last):
         File ".../salt/tests/support/gitfs.py", line 481, in tearDownClass
           if cls.case.sshd_proc is not None:
       AttributeError: 'NoneType' object has no attribute 'sshd_proc'
   ...................................................................................................................................................
   -> tearDownClass (integration.pillar.test_git_pillar.TestPygit2SSH)  ..............................................................................
       Traceback (most recent call last):
         File ".../salt/tests/support/gitfs.py", line 481, in tearDownClass
           if cls.case.sshd_proc is not None:
       AttributeError: 'NoneType' object has no attribute 'sshd_proc'
   ...................................................................................................................................................
 -----------------------------------------------------------------------------------------------------------------------------------------------------

Signed-off-by: Mathieu Parent <math.parent@gmail.com>
(cherry picked from commit 84e9fce9bb)
2018-11-16 06:07:22 +01:00
Erik Johnson
fbee11dadc
Enable proxy/ssh daemons when filename mapping causes those tests to be run
The proxy and ssh tests won't run when the `--proxy` and `--ssh` CLI
flags, respectively, aren't passed to runtests.py. This ensures that we
start the daemons when the file mapping logic triggers them to be run.
2018-11-15 16:26:05 -06:00
twangboy
30cf8664b0
Fix some lint 2018-11-15 14:52:54 -07:00
twangboy
1650881989
Fix tets_nacl on Py3
Move the nacl tests from integration to unit
2018-11-15 13:20:39 -07:00
Gareth J. Greenaway
4f30611c69
lint 2018-11-15 10:31:30 -08:00
Gareth J. Greenaway
4f9eb95d7f
Fixing a typo in the _virtual function, should be checking for existing grains in osdata not grains. Updating the detection to look for /sys/bus/xen/drivers/xenconsole instead of specifically looking for any files under /sys/bus/xen/drivers. Some systems that are not running as Xen PV hosts include files under that location, particular Oracle Linux. 2018-11-15 10:31:30 -08:00
Nicole Thomas
0327ea0469
Merge pull request #50522 from cbosdo/fluorine-backport
Test and fix disk creation in virt.init
2018-11-15 09:48:06 -05:00
Cédric Bosdonnat
0786123d03
Test and fix disk creation in virt.init
Adding a test case in virt.init uncovered a few issues: a passed
exception that we really want to report to the user, and disks that
were not created.
2018-11-15 10:57:30 +01:00
bornwitbugs
e59ced6507
Merge branch '2018.3' of github.com:saltstack/salt into load_beacon_fix 2018-11-14 17:54:37 +00:00
Ch3LL
8501581f27
Merge branch '2018.3' into 'fluorine'
Conflicts:
  - salt/utils/mac_utils.py
  - salt/utils/win_runas.py
  - tests/support/case.py
2018-11-14 12:38:16 -05:00
Ch3LL
178dab3a4b
Merge branch 2017.7 into 2018.3
Conflicts:
  - doc/topics/tutorials/salt_bootstrap.rst
  - tests/integration/cloud/clouds/test_digitalocean.py
2018-11-14 10:33:44 -05:00
Nicole Thomas
9e63cde7c5
Merge pull request #50472 from cbosdo/fluorine-backport
Fix virt.update for NICs mac and model
2018-11-13 16:17:30 -05:00
Mike Place
c1dde7e9b1
Merge pull request #50328 from rallytime/fix-48734
Fix issue with salt-run jobs.list_jobs where Target: unknown-target
2018-11-13 12:49:57 -07:00
Nicole Thomas
c00fd43ee9
Merge pull request #50493 from rallytime/bp-50362
Back-port #50362 to 2017.7
2018-11-13 11:59:50 -05:00
Nicole Thomas
6b272c1d65
Merge pull request #50492 from rallytime/bp-50228-and-50443
Back-port #50228 and #50443 to 2018.3
2018-11-13 11:59:14 -05:00
rallytime
f578392eb4
Lint Fix: add mock_open import 2018-11-13 09:30:02 -05:00
twangboy
60559cfa8a
Remove flaky test 2018-11-13 09:25:47 -05:00
twangboy
a696a8f564
Fix test_matcher on Windows
Fixes a timeout issue in test_salt_documentation_arguments_not_assumed
2018-11-13 09:25:41 -05:00
Shea Craig
3c36bddd8a
Fix linting errors. 2018-11-13 09:22:24 -05:00
Shea Craig
fab57de795
Write tests to handle invalid launchd plist XML. 2018-11-13 09:21:58 -05:00
Shea Craig
bb429b0dff
Condense service result assertions, add a binary plist test. 2018-11-13 09:21:58 -05:00
Shea Craig
a809fef417
Factor out another helper function, implement broken symlink test. 2018-11-13 09:21:58 -05:00
Shea Craig
216f7ef864
Update testing for mac_utils services.
This commit begins to go over the existing testing for mac_utils,
applying the updated best-practices from the unit testing section of the
Salt docs.

Wherever possible, I've tried to keep the data for each test within the
test, while factoring out repetitive functions. In this commit, for
example, the `os.walk` side_effect func has been factored into its own
helper function.

This commit begins looking at what is being tested for this module and
making it more specific, specifically to test one thing per test
(existing tests had multiple asserts and in some casaes were actually
malformed such that the tests would pass, but in actual use, code would
throw an exception and skip over the block).
2018-11-13 09:21:57 -05:00
Shea Craig
ae6f49b0b1
Make test correctly generate a double exception. 2018-11-13 09:11:18 -05:00
Daniel Wozniak
7dd34386ef
Merge pull request #50456 from terminalmage/issue50218
Two bugfixes
2018-11-12 23:06:51 -07:00
Nicole Thomas
917781dc95
Lint: Add blank line 2018-11-12 17:47:46 -05:00
Nicole Thomas
cfb33511df
Merge pull request #50483 from rallytime/bp-50272
Back-port #50272 to 2018.3
2018-11-12 17:45:05 -05:00
Erik Johnson
0f02da7fec
Remove unnecessary u prefix from string literals
These are redundant with unicode_literals being used
2018-11-12 16:45:28 -05:00
Erik Johnson
fc26ae8ea3
Add unit test for comparing containers with the same env vars 2018-11-12 16:45:22 -05:00
rallytime
c7ebb7f96d
Merge branch '2018.3' into 'fluorine'
No conflicts.
2018-11-12 16:20:41 -05:00
rallytime
1517bb31a8
Update old utils paths to use new paths 2018-11-12 16:13:35 -05:00
rallytime
d8e7c47a05
Merge branch '2017.7' into '2018.3'
Conflicts:
  - tests/support/case.py
2018-11-12 16:11:17 -05:00
Ch3LL
3583519da4
Update digital ocean location for cloud tests 2018-11-12 15:52:32 -05:00
Nicole Thomas
b16ff9cd1c
Merge pull request #50469 from dwoz/minion_timeout_test
Fix up integration.minion.test_timeout
2018-11-12 11:53:45 -05:00
Erik Johnson
6143408507
Add unit test for TimedProc regression 2018-11-12 09:08:49 -06:00
Cédric Bosdonnat
4b628d2f66
virt.update: only compare NIC properties we handle
virt.update compares NIC devices to guess if they need to be updated. It
needs to allow changing the properties the user is inputing including mac
and model. It also should not compare properties we don't handle: that
could destroy vlan definitions or other important bits.
2018-11-12 14:12:10 +01:00
Daniel A. Wozniak
794ba17c94
Reset date and time after changing 2018-11-12 00:43:22 -07:00
Daniel A. Wozniak
57f702dc58
Fix linter warning 2018-11-11 21:49:20 -07:00
Daniel A. Wozniak
686153a77c
Fix up integration.minion.test_timeout
This test wasn't able to be run on it's own. Fix it and add more
debugging
2018-11-11 21:30:08 -07:00
bornwitbugs
d07c84d7ad
reordering ret dictionary in load test to ascending order 2018-11-11 03:47:12 +00:00
Nicole Thomas
c51f3643c2
Merge pull request #50448 from cbosdo/fluorine-backport
Fix virtual disk creation in update
2018-11-09 10:00:04 -05:00
Nicole Thomas
e6a285c3f6
Merge pull request #50440 from Ch3LL/mac_system_flaky
Add attempts kwarg in flaky test decorator
2018-11-09 09:53:31 -05:00
Nicole Thomas
081b219912
Merge pull request #50390 from twangboy/fix_test_nacl
Fix integration.runners.test_nacl on Windows Py3
2018-11-09 09:37:20 -05:00
Nicole Thomas
fe522b2b62
Merge branch 'fluorine' into fluorine-backport 2018-11-09 09:34:13 -05:00
Nicole Thomas
a921df0fb6
Merge pull request #50437 from rallytime/merge-fluorine
[fluorine] Merge forward from 2018.3 to fluorine
2018-11-09 09:33:56 -05:00
Cédric Bosdonnat
819bd6aacd
Fix virtual disk creation in update
Some disk devices like cdroms may have an empty source_file: handle it
or we will fail when testing for the file presence.
2018-11-09 14:10:44 +01:00