Commit Graph

100915 Commits

Author SHA1 Message Date
Daniel Wozniak
8440ae1b3d
Merge branch '2019.2' into 52116-fix-host-present-fail 2019-04-11 15:38:30 -07:00
Daniel Wozniak
dd002fdad8
Fix linter 2019-04-11 15:38:15 -07:00
Daniel Wozniak
b0d3c76060
Merge pull request #52423 from bbinet/unused-salt-crypt
Remove unused salt.crypt import
2019-04-11 14:44:40 -07:00
Daniel Wozniak
4bb918524b
Merge pull request #52506 from bloomberg/2019_zmq_uri
2019.2: transport.zmq: fix bug introduced by b7df7e75cf
2019-04-11 14:12:50 -07:00
Daniel Wozniak
1532642e07
Merge pull request #52513 from dwoz/supervisord_2019.2
[2019.2] Fix supervisord
2019-04-11 14:09:16 -07:00
Pedro Algarvio
dc9ace6405
The exit code matters.
Prefix any output with ERROR on non 0 exit code because that's what the
supervisord state checks for.
2019-04-11 13:32:43 -07:00
Matt Phillips
1e9dd7fd3f transport.zmq: fix bug introduced by b7df7e75cf
this change was introduced to address evidently another bug where
somehow self.opts has no master_uri - but in the process it prioritized
using master_ip over master_uri even when master_uri _is_ there.
providing master_uri as a way of specifiying which msater you would like
to create a channel for is documented used elsewhere in the codebase in
multi-master scenarios (ie, event.send, saltutil.revoke_auth)
2019-04-11 13:56:13 -04:00
Bruno Binet
dc330e75bd
Merge branch '2019.2' into unused-salt-crypt 2019-04-11 09:12:38 +02:00
Daniel Wozniak
978084dd97
Merge pull request #52496 from dwoz/ipc_wart
Fix wart in IPC merge forward
2019-04-10 22:19:01 -07:00
Daniel A. Wozniak
9805f38e13
Fix wart in IPC merge forward 2019-04-11 02:04:55 +00:00
Gareth J. Greenaway
791b64653d
Merge pull request #52482 from dwoz/ipc_fixes_2019.2
Ipc fixes 2019.2
2019-04-10 12:53:57 -07:00
Daniel A. Wozniak
f45d29b222
Remove un-needed test 2019-04-10 19:16:14 +00:00
Daniel A. Wozniak
0141b7f744
Fix merge wart 2019-04-10 18:20:31 +00:00
Daniel A. Wozniak
82150f0241
Remove un-used import 2019-04-10 18:01:52 +00:00
Daniel A. Wozniak
c9ec8b1f97
Ensure exceptions in service future are handled 2019-04-10 17:37:36 +00:00
Daniel A. Wozniak
25f5a90bd6
Use six.reraise for py3 compatability 2019-04-10 17:36:47 +00:00
Daniel A. Wozniak
6d80789cf1
Fix ipc unit tests 2019-04-10 17:36:36 +00:00
Daniel A. Wozniak
c80da32234
Fix linter issues 2019-04-10 17:36:28 +00:00
Daniel A. Wozniak
024b4b61eb
Remove IPCClient singleton 2019-04-10 17:36:05 +00:00
Daniel A. Wozniak
f1d0e025ec
Re-raise queued exceptions with traceback 2019-04-10 17:33:24 +00:00
Gareth J. Greenaway
3173673dcc
Merge pull request #51992 from garethgreenaway/51932_show_diff_when_test_True
[2019.2] Swapping pchanges for changes in file state.
2019-04-09 12:38:56 -07:00
Gareth J. Greenaway
7c4abd6d6e
changes needs to be a dictionary. 2019-04-09 11:05:34 -07:00
Gareth J. Greenaway
ac950b34c8
Merge branch '2019.2' into 51932_show_diff_when_test_True 2019-04-09 08:32:10 -07:00
Shane Lee
4b26dea9b6
Merge branch '2019.2' into unused-salt-crypt 2019-04-08 13:48:24 -06:00
Gareth J. Greenaway
bd3ad7b83c
Merge pull request #52413 from Ch3LL/merge-2019.2
[2019.2] Merge forward from 2018.3 to 2019.2
2019-04-08 09:19:49 -07:00
Megan Wilhite
30783f4c45
Merge branch '2019.2' into merge-2019.2 2019-04-08 09:36:48 -04:00
Megan Wilhite
a18abf2bfb
Merge pull request #52151 from simonflood/patch-2
Fix typo in actual 2019.2.0 release notes
2019-04-08 09:36:27 -04:00
Megan Wilhite
a4a552191a
Merge branch '2019.2' into patch-2 2019-04-05 17:41:55 -04:00
Gareth J. Greenaway
0ce0c043b5
Merge branch '2019.2' into 51932_show_diff_when_test_True 2019-04-05 14:10:04 -07:00
Gareth J. Greenaway
16733da066
Merge branch '2019.2' into merge-2019.2 2019-04-05 13:38:40 -07:00
Gareth J. Greenaway
6bae227f77
Merge pull request #52381 from dwoz/issue_51869
Fix issue #51869 and add cert signing test
2019-04-05 13:36:10 -07:00
Gareth J. Greenaway
cd78485aab
Merge branch '2019.2' into issue_51869 2019-04-05 13:35:27 -07:00
Bruno Binet
9607c38065 Also remove unused salt.crypt import in pillar/__init__.py 2019-04-05 15:37:54 +02:00
Bruno Binet
49f26316c8 Remove unused salt.crypt import
This causes pepper to fail on windows because of missing libcrypto.

See also #51655 for similar salt.crypt removals
2019-04-05 15:29:40 +02:00
Ch3LL
fe13214bd1
Merge branch '2018.3' into '2019.2'
No conflicts.
2019-04-04 09:35:08 -04:00
Daniel Wozniak
b6028b907b
Merge pull request #52403 from bdrung/fix-test-conditions
Fix test conditions
2019-04-03 10:07:53 -07:00
Daniel Wozniak
c1063cfe67
Merge pull request #52370 from jfindlay/traceroute
Fix network.traceroute exec module function
2019-04-03 09:39:20 -07:00
Daniel Wozniak
e5a755d45d
Merge pull request #52250 from twangboy/fix_grains
Fix the domain grain on Windows
2019-04-03 09:28:54 -07:00
Benjamin Drung
e74f78fca6 Skip ExtendTestCase if templates directory is missing
The release tarball does not contain the `templates` directory.
Therefore `ExtendTestCase` will fail:

```
======================================================================
ERROR: test_run (unit.utils.test_extend.ExtendTestCase)
[CPU:0.0%|MEM:53.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/utils/test_extend.py", line 40, in test_run
    out = salt.utils.extend.run('test', 'test', 'this description', integration.CODE_DIR, False)
  File "salt/utils/extend.py", line 242, in run
    MODULE_OPTIONS = _fetch_templates(os.path.join(salt_dir, 'templates'))
  File "salt/utils/extend.py", line 76, in _fetch_templates
    for item in os.listdir(src):
FileNotFoundError: [Errno 2] No such file or directory: ' templates'
```

Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2019-04-03 16:33:07 +02:00
Benjamin Drung
0473683ace Skip SampleConfTest if sample conf directories are missing
The release tarball does not contain `conf/cloud.profiles.d`,
`conf/cloud.providers.d`, and `conf/cloud.maps.d`. Therefore the test
cases will fail:

```
======================================================================
ERROR: test_conf_cloud_maps_d_files_are_commented (unit.test_config.SampleConfTest)
[CPU:0.0%|MEM:53.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/test_config.py", line 236, in test_conf_cloud_maps_d_files_are_commented
    cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.maps.d/')
FileNotFoundError: [Errno 2] No such file or directory: 'conf/cloud.maps.d/'

======================================================================
ERROR: test_conf_cloud_profiles_d_files_are_commented (unit.test_config.SampleConfTest)
[CPU:0.0%|MEM:53.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/test_config.py", line 200, in test_conf_cloud_profiles_d_files_are_commented
    cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.profiles.d/')
FileNotFoundError: [Errno 2] No such file or directory: 'conf/cloud.profiles.d/'

======================================================================
ERROR: test_conf_cloud_providers_d_files_are_commented (unit.test_config.SampleConfTest)
[CPU:0.0%|MEM:53.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/test_config.py", line 218, in test_conf_cloud_providers_d_files_are_commented
    cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.providers.d/')
FileNotFoundError: [Errno 2] No such file or directory: 'conf/cloud.providers.d/'
```

Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2019-04-03 16:32:58 +02:00
Justin Findlay
2f49231233
modules.network: update unit test 2019-04-02 20:45:52 -07:00
Justin Findlay
5b64fc054c
modules.network: log and skip problematic traceroute lines 2019-04-02 20:45:51 -07:00
Justin Findlay
e33f5c1fa4
modules.network: standardize util check 2019-04-02 20:45:50 -07:00
Wayne Werner
9d1b2a0217
Only return None on host.present changes when test
Previously, when using `test=True`, `host.present` would return
`None` always. In Salt we return `True` when there are (or would be)
changes, `False` when there are no changes, and `None` when there
*would* have been changes.

This brings `host.present` in-line with that convention.
2019-04-02 19:10:36 -05:00
Daniel Wozniak
3675f1e67e
Merge pull request #52397 from garethgreenaway/merge-2019.2
[2019.2] Merge forward from 2018.3 to 2019.2
2019-04-02 15:12:44 -07:00
Daniel A. Wozniak
855f31a1aa
Remove un-used file 2019-04-02 14:29:53 -07:00
Daniel A. Wozniak
affd9b88b8
Fix setup/teardown methods 2019-04-02 21:12:11 +00:00
Daniel A. Wozniak
215bf931f2
Refresh after modifying tmp pillars 2019-04-02 21:08:00 +00:00
Gareth J. Greenaway
28e76b1fb2
Merge branch '2018.3' into merge-2019.2
Conflicts:
   - tests/unit/grains/test_core.py
2019-04-02 14:05:55 -07:00
Daniel A. Wozniak
95c3aba426
Add config for listener 2019-04-02 20:24:55 +00:00