valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
102,026 Commits 24 Branches 182 Tags 341 MiB
76609adc1b
Commit Graph

207 Commits

Author SHA1 Message Date
Gareth J. Greenaway
6c99cb161f
Merge branch '2018.3' into merge-2018.3 
Conflicts:
	doc/man/salt-api.1
	doc/man/salt-call.1
	doc/man/salt-cloud.1
	doc/man/salt-cp.1
	doc/man/salt-key.1
	doc/man/salt-master.1
	doc/man/salt-minion.1
	doc/man/salt-proxy.1
	doc/man/salt-run.1
	doc/man/salt-ssh.1
	doc/man/salt-syndic.1
	doc/man/salt-unity.1
	doc/man/salt.1
	doc/man/salt.7
	doc/man/spm.1
	pkg/osx/build_env.sh
	salt/utils/dns.py
	tests/integration/netapi/rest_tornado/test_app.py
	tests/support/case.py
	tests/unit/utils/test_dns.py
 2019-02-11 15:45:43 -08:00
Erik Johnson
3cec85e725
Normalize results if test proxy is enabled 2019-01-29 12:58:24 -06:00
Gareth J. Greenaway
3dbe8dc8be
When making auth calls, only username, password, auth, and token are valid, so we strip anything else out. 2019-01-24 12:45:35 -08:00
rallytime
8fed338708
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/spm/pkgfiles/local.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
 2018-10-25 10:31:06 -04:00
Nicole Thomas
8ad9a1bd61
Merge pull request #50201 from Ch3LL/_2018.3.3 
[2018.3] Ensure that tokens are hex to avoid hanging/errors in cherrypy
 2018-10-24 15:44:23 -04:00
Nicole Thomas
d0c68df885
Merge pull request #49878 from rallytime/merge-fluorine 
[fluorine] Merge forward from 2018.3 to fluorine
 2018-10-17 13:58:31 -04:00
rallytime
2bb6d9771d
Mark one of the cherrypy tests as flaky 
This test fails occassionally, but not consistently. Let's mark it as
flaky for now.
 2018-10-03 11:06:14 -04:00
rallytime
46c0e50638
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/man/salt.7
 2018-10-03 09:45:20 -04:00
rallytime
0e761036f1
Merge branch '2018.3.3' into '2018.3' 
No conflicts.
 2018-09-30 12:39:44 -04:00
Ch3LL
ad0d83c6a8
Add tests with filname in token data 2018-09-25 16:13:31 -04:00
Ch3LL
9756f8f56e
Add empty token salt-api integration tests 2018-09-25 16:13:31 -04:00
Ch3LL
335227145a
Update tornado test to correct authentication message 2018-09-25 11:47:19 -04:00
Erik Johnson
112d2ec080
Fix netapi tests 
localhost should not appear in minion list unless there is an exchanged
key for it, which there is not
 2018-09-24 15:39:29 -05:00
C. R. Oldham
1697a4340c
Revert "Fix test." 
This reverts commit 86b5c95c6cece645e69f098d3dd88220435a569b.
 2018-09-21 09:35:55 -06:00
C. R. Oldham
138e389e5b
Fix test. 2018-09-21 09:35:54 -06:00
Erik Johnson
80dcb44a0d
Merge remote-tracking branch 'upstream/2018.3' into merge-fluorine 
Conflicts:
- salt/utils/mac_utils.py
- tests/unit/config/test_config.py
- tests/unit/loader/test_globals.py
- tests/unit/ssh/test_ssh.py
- tests/unit/templates/test_jinja.py
- tests/unit/utils/vmware/test_host.py
- tests/unit/utils/vmware/test_license.py
 2018-08-17 07:52:59 -05:00
Erik Johnson
3d8523b031
Fix import for moved module 2018-08-14 13:53:31 -05:00
rallytime
6e6091c3ba
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/integration/runners/test_cache.py
  - tests/support/case.py
 2018-08-14 09:57:37 -04:00
Nicole Thomas
0e1ed7b923
Merge pull request #49055 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-08-13 15:20:10 -04:00
Daniel Wallace
4386a9ca1f
Merge branch '2018.3' into isbm-python37-support-2018.3 2018-08-10 15:47:12 -05:00
rallytime
5ff1ddb0dd
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/utils/schedule.py
  - tests/integration/files/conf/master
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/runners/test_state.py
  - tests/integration/scheduler/test_eval.py
 2018-08-10 14:18:34 -04:00
rallytime
201031fa8a
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - 	doc/man/salt.7
  - 	doc/ref/configuration/minion.rst
  - 	salt/cloud/clouds/ec2.py
  - 	salt/returners/highstate_return.py
  - 	tests/support/gitfs.py
  - 	tests/unit/loader/test_loader.py
 2018-08-10 13:12:14 -04:00
Daniel Wallace
6bc44c91c4
remove localhost from tests 
now that enable_ssh_minions is turned off, remove localhost from
returns.
 2018-08-10 09:03:35 -05:00
Bo Maryniuk
35eaebb8a4 Fix docstrings 2018-08-10 15:59:23 +02:00
Nicole Thomas
3de190bcdf
Merge pull request #48705 from isbm/isbm-python37-support 
Python 3.7 support
 2018-08-10 09:00:12 -04:00
Bo Maryniuk
00e26bf55b Fix docstrings 2018-08-09 17:51:16 +02: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
3b2e8963f3
Skip flaky test 2018-08-08 14:30:43 -04:00
rallytime
3e6445a9d6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/beacons/log.py
  - salt/client/ssh/__init__.py
  - salt/modules/cmdmod.py
  - salt/utils/win_functions.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/runners/test_state.py
 2018-08-08 13:31:57 -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
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
rallytime
7332cce567
[2017.7] Mark some tornado tests as flaky 2018-07-23 12:53:26 -04:00
Gareth J. Greenaway
545d2acbb4
removing unused skipif 2018-06-30 16:39:41 -07:00
Gareth J. Greenaway
452d9d9bf7
fixing merge conflict. 2018-06-30 14:40:39 -07:00
rallytime
c4fd2a0930
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/rabbitmq.py
  - tests/integration/modules/test_pip.py
 2018-06-30 09:33:21 -04:00
rallytime
a50dc60a1f
Skip new batch test in Fluorine until it can be investigated better 2018-06-29 14:46:50 -04:00
rallytime
6177d6e3c1
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/client/__init__.py
  - salt/grains/core.py
  - salt/modules/timezone.py
  - tests/support/case.py
  - tests/unit/modules/test_file.py
  - tests/unit/roster/test_sshconfig.py
 2018-06-25 11:26:25 -04:00
Thomas Jackson
c0180ff33d
Properly configure syndic in test case 
Without this option we aren't really a syndic and it won't wait
 2018-06-25 10:26:30 -04:00
Gareth J. Greenaway
aea4f7ae14
Fixing test_local_batch 2018-06-24 16:03:47 -07:00
Gareth J. Greenaway
ce3e1eaf2c
Removing sort. 2018-06-23 11:25:46 -07:00
Gareth J. Greenaway
83accf3b20
Fixing test_local_batch 2018-06-22 12:19:41 -07:00
Gareth J. Greenaway
85cef126e0
Adding note about why salt.utils.versions is being re-imported. Adding a test for local_batch. 2018-06-22 12:19:40 -07:00
Thomas Jackson
10038f9e5b Properly configure syndic in test case 
Without this option we aren't really a syndic and it won't wait
 2018-06-21 09:33:32 -07:00
rallytime
e9cb080a00
Cleanup weird spaces 
Some spaces between the `@` and the `skipIf` snuck into the branch
and the linter, nor the tests, caught this for some reason.
 2018-05-07 14:51:39 -04:00
rallytime
00f965cb2b
Lint: Remove extraneous spaces 2018-05-07 14:49:31 -04:00
rallytime
53d2851826
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - salt/pillar/pillar_ldap.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2018-05-07 14:13:34 -04:00
rallytime
be0731da5f
Add skipIfs back in for rest_tornado tests 
These were removed in a downstream PR, #47415, and are now failing again
in this merge forward.

I will contact the OP about addressing this in 2018.3 as these test failures
are not something I have been able to track down in a merge-forward PR.
 2018-05-03 16:23:59 -04:00
rallytime
a94cdf8a0d
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/daemons/flo/zero.py
  - salt/minion.py
  - salt/pillar/pillar_ldap.py
  - salt/transport/zeromq.py
  - salt/utils/async.py
  - salt/utils/zeromq.py
  - tests/integration/modules/test_service.py
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_pip.py
 2018-05-02 15:00:40 -04:00
Mike Place
2f5fc4ecc5
Merge pull request #47399 from isbm/isbm-zeromq17-deprecationwarning-2017.7.2-v2 
zeromq 17 deprecation warning backport from 2018.3 + tornado 5 fixes
 2018-05-02 10:11:15 -05:00
kstreee@gmail.com
b8d37e0a1e
To add a test case for the syndic environment, copies the test case which was written by @mattp- that was already merged into develop branch, related pr is #46692. 2018-05-02 03:21:06 +09:00