rallytime
148df32604
Merge branch '2016.11' into 'develop'
...
No conflicts.
2017-03-15 14:52:07 -06:00
Mike Place
5734e2b0a8
Merge pull request #40027 from terminalmage/py3-tests
...
Update git state integration tests for PY3 compatibility
2017-03-15 13:40:55 -06:00
Erik Johnson
ef110baa99
Update git state integration tests for PY3 compatibility
...
Python 3 didn't like some of the stuff that we were doing with
``subprocess.check_call()`` in these tests, so to fix this I have redone
that stuff with calls to functions in the git execution module. In order
to avoid problems with running tests with no global gitconfig, I needed
to add an argument called ``git_opts`` to most of the funcs in the git
execution module (well I didn't *need* to do it to most of the funcs, it
just seemed like we shouldn't only be supporting this argument in a
single function).
This new ``git_opts`` argument is specifically for passing arguments to
the git command itself (not the subcommand). For example, ``git -c
user.name="Foo Bar" commit .....`` is different than running ``git
commit -c user.name="Foo Bar" .....``, because the ``commit`` subcommand
for git also accepts ``-c``.
2017-03-14 18:07:06 -05:00
rallytime
fe4a208569
Add flaky decorator to flaky rest_tornado test
2017-03-14 16:30:54 -06:00
rallytime
029f28bbd5
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/modules/cmdmod.py
2017-03-14 15:44:38 -06:00
Nicole Thomas
0ec81a4cde
Fixup a syntax error
2017-03-14 11:15:02 -06:00
Nicole Thomas
2714676a13
Merge pull request #39746 from terminalmage/pathutils
...
Add salt.utils.path
2017-03-14 11:00:34 -06:00
Erik Johnson
5d84b40bfd
Attempt to fix failing grains tests in 2016.3
...
The tearDown appears to only be removing the grain if it matches a
specific value. This may be leading to the grain value not being blank
at the time the next test is run.
Instead of only deleting the grain if it matches a specific value,
instead delete all items from that grain to ensure that it is empty for
the next test.
2017-03-14 11:25:15 -05:00
Pedro Algarvio
410b583a63
The port attribute definition must come first
2017-03-12 18:05:30 +00:00
Pedro Algarvio
992a8c7294
Don't hardcode the webserver port number
2017-03-11 16:00:28 +00:00
Erik Johnson
d2206d1a94
Changes to imports to comport with test suite changes in develop
2017-03-10 11:05:02 -06:00
Erik Johnson
db5208b65a
Set up special file_roots for windows symlink test
2017-03-10 11:05:02 -06:00
Erik Johnson
22d5689eb0
Clarify reason for skipping test
2017-03-10 11:05:02 -06:00
twangboy
05cca8b72d
Add filerserver test to whitelist, skip symlink test
2017-03-10 11:05:02 -06:00
Mike Place
bbf4eacbba
Merge pull request #39930 from s0undt3ch/features/py3
...
Moar Py3 and a fix for #38121
2017-03-09 17:25:01 -07:00
rallytime
4a52cca926
Pylint fixes
2017-03-09 14:55:33 -07:00
Pedro Algarvio
4627c4ea6d
Code cleanup and make sure the beacons config file is deleted after testing
...
Conflicts:
- tests/integration/modules/beacons.py
2017-03-09 13:35:16 -07:00
rallytime
e7fa367548
[develop] Fix pylint error
2017-03-09 13:04:51 -07:00
Pedro Algarvio
50e51b5b9d
The beacons configuration is now a list. Handle it!
2017-03-09 13:00:41 -07:00
Pedro Algarvio
680bbec79f
The beacons configuration is now a list. Handle it!
2017-03-09 19:31:13 +00:00
Pedro Algarvio
dd53f055b9
Code cleanup and make sure the beacons config file is deleted after testing
2017-03-09 19:29:16 +00:00
Pedro Algarvio
42065350f1
Catch and handle tornado.iostream.StreamClosedError exceptions
2017-03-09 19:29:16 +00:00
Nicole Thomas
2f0f7cd224
Merge pull request #39897 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-03-09 09:03:46 -07:00
rallytime
c6cfac7678
Pylint fix
2017-03-08 16:24:03 -07:00
Pedro Algarvio
51c5558b32
This should no longer hang
2017-03-08 20:43:36 +00:00
Pedro Algarvio
0b41b92d7d
Use salt.utils.versions instead of distutils.version
2017-03-08 19:22:33 +00:00
Pedro Algarvio
06c063a609
Test assertion cannot be done in the callback context
2017-03-08 18:34:34 +00:00
Pedro Algarvio
b58241648a
Use the tests support paths module
2017-03-08 18:34:34 +00:00
Pedro Algarvio
7fffd93b50
Don't pollute the repo tests state tree
2017-03-08 18:34:33 +00:00
Pedro Algarvio
b391a4eb5b
Supervisord does not work under Python 3
2017-03-08 18:34:33 +00:00
Pedro Algarvio
e2e303e724
Minor changes to paths
2017-03-08 18:34:32 +00:00
Pedro Algarvio
712b81e0c1
supervisor does not run against py3. Use pep8 for the tests.
2017-03-08 18:34:32 +00:00
Pedro Algarvio
07d0a5ed20
Cleanup after ourselves
2017-03-08 18:34:32 +00:00
Pedro Algarvio
c436d9f2f6
This no longer applies.
2017-03-08 18:34:31 +00:00
rallytime
4fc9b5484b
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/client/ssh/__init__.py
- salt/pillar/makostack.py
- tests/integration/client/test_runner.py
- tests/integration/states/test_file.py
2017-03-08 09:04:26 -07:00
Pedro Algarvio
7dc6b64689
No need to call .keys() when iterating a dictionary
2017-03-06 14:42:31 +00:00
Pedro Algarvio
ffec7dc299
Lint fixes
2017-03-06 14:35:16 +00:00
Mike Place
3341e4e202
Merge pull request #39492 from whiteinge/full_return-arg
...
Add full_return arg to LocalClient and RunnerClient
2017-03-04 09:14:17 -07:00
Mike Place
c10abec6d3
Merge pull request #39797 from twangboy/win_fix_test_git
...
Fix test_worktree_add_rm test for Windows
2017-03-04 09:12:12 -07:00
Pedro Algarvio
adacf4cc28
Don't expect any ordering from sets!!!!!
2017-03-03 18:31:11 +00:00
twangboy
2a6e61a42e
Add encode for Py3 compatability
2017-03-03 10:53:12 -07:00
twangboy
54891a57b1
Fix type in second worktree_path
2017-03-03 10:24:28 -07:00
Pedro Algarvio
e180f1e913
Normalize the mode
2017-03-03 15:15:13 +00:00
twangboy
25938ebc8e
Fix test_add_user_to_group for Windows
2017-03-02 15:40:22 -07:00
twangboy
ef53ec7efe
Fix test_worktree_add_rm test for Windows
2017-03-02 14:37:53 -07:00
Pedro Algarvio
5b5a6ebbe8
Minor code cleanup
2017-03-02 19:58:10 +00:00
Pedro Algarvio
5e3309d5f8
Let's use the skip_if_not_root decorator instead
2017-03-02 19:58:10 +00:00
Pedro Algarvio
2f3d0b0b81
These are not destructive tests
2017-03-02 19:58:10 +00:00
Pedro Algarvio
80002276c2
These tests are not destructive
2017-03-02 19:58:10 +00:00
Pedro Algarvio
519a3f689e
These tests are not destructive
2017-03-02 19:56:06 +00:00
