Commit Graph

3411 Commits

Author SHA1 Message Date
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
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
Pedro Algarvio
31df825a1c
Set the ssh_log_file relative 2017-03-02 19:56:06 +00:00
Pedro Algarvio
fc501e93ac
Remove deprecated options 2017-03-02 19:56:05 +00:00
Pedro Algarvio
7b4d849540
Moved some test supporting modules to tests/support
Previously they were in tests/utils which also had test case modules.
2017-03-02 19:56:05 +00:00
Pedro Algarvio
979090d225
We need bytes under Py3 to compute the hash 2017-03-02 19:56:04 +00:00
Seth House
c25ffd5d2e Add LocalClient and RunnerClient full_return tests 2017-03-02 11:46:27 -07:00
Shane Lee
eb6d317289 Merge branch 'develop' into win_fix_renderers_tests 2017-03-02 10:29:36 -07:00
twangboy
ad654abc20 Clarify the reason for the while loop 2017-03-01 14:00:06 -07:00
twangboy
25b6d221c4 Fix ext_grains and ext_modules tests for Windows 2017-03-01 14:00:06 -07:00
Mike Place
517842a339 Merge pull request #39696 from twangboy/win_fix_returners_tests
Fix job cache tests, add librato return tests
2017-03-01 10:24:59 -07:00
Mike Place
33e40c94e4
Fix docs test for #39753 2017-03-01 09:06:17 -07:00
Pedro Algarvio
a78c037a5f
PyLint, no its not a repeated keyword! 2017-03-01 01:33:08 +00:00
Pedro Algarvio
4f425e596b
Don't assert, just fail 2017-03-01 01:33:08 +00:00
Pedro Algarvio
bb60e5010c
Redundant 2017-03-01 01:33:08 +00:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00:00
twangboy
037dfb3ece Fix lint error 2017-02-28 15:56:06 -07:00
Pedro Algarvio
3beb3fb801
Move whatever we need from salttesting to salt.
Let's drop the salttesting dependency cycle.
2017-02-28 22:52:49 +00:00
Pedro Algarvio
08804932c3
Using pytest start_daemon 2017-02-28 22:52:48 +00:00
Pedro Algarvio
1daa2e24cd
Moved some test supporting modules to tests/support
Previously they were in tests/utils which also had test case modules.
2017-02-28 22:52:48 +00:00
Pedro Algarvio
7278a6c868
You need to pass a list. How did this ever pass?! 2017-02-28 22:52:48 +00:00
Mike Place
a73a5f9c1f Merge pull request #39646 from terminalmage/zh921
Handle deprecation of passing string args to load_args_and_kwargs
2017-02-28 14:59:33 -07:00
Nicole Thomas
8809d33674 Merge pull request #39701 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-02-28 12:50:10 -07:00
Erik Johnson
7b958fb389 Add options to skip fileserver/git_pillar preflight checks
This commit also modifies the master config for the test suite to use
this new option, so that a missing GitPython/Pygit2 will not crash the
test suite's master. This should make the test suite run smoother by
only negatively impacting those tests which require the pillar data
provided by git_pillar, when a valid provider is not available.
2017-02-27 20:21:53 -06:00
rallytime
b4366103a6 Merge branch '2016.11' into 'develop'
Conflicts:
  - .pylintrc
  - .testing.pylintrc
  - salt/fileclient.py
  - salt/minion.py
  - salt/modules/docker.py
  - salt/modules/win_iis.py
  - salt/states/docker.py
  - salt/states/file.py
  - salt/utils/__init__.py
  - tests/integration/modules/test_sysmod.py
2017-02-27 15:11:37 -07:00
twangboy
b434523a51 Fix job cache tests, add librato return tests 2017-02-27 13:26:42 -07:00
Mike Place
b6dea5efb9
Correct small bug with docs test. 2017-02-27 09:59:25 -07:00
Erik Johnson
5a3c099e4f Rewrite the tests_valid_docs test
This uses a function in the runtests_helpers custom module to perform
all the logic, and only returns what failed the test. This saves us from
having to return the entire contents of sys.doc (as well as log all of
the function calls), and also removes the need to run sys.doc in batches
to get around the "max message size" issue.
2017-02-26 12:21:00 -06:00
Erik Johnson
9f6d08d606 Update tests which used string kwargs 2017-02-25 20:11:06 -06:00
Erik Johnson
503216e5c5 Add warnings to test suite when requisites are not installed
Since we have recently changed the test suite to use new-style
git_pillar, GitPython or Pygit2 is a hard dep for the test suite.

Additionally, when starting up the daemons, if no IPv4 addresses can be
detected (which can happen on docker containers which tend to have
minimal installs) then the suite will time out trying to detect whether
or not the minion/sub-minion has connected, which while it does not
prove fatal for the test suite, it does make the suite take several
minutes to start up and begin running tests. This is because the test
suite invokes the manage.joined runner, which in turn invokes
salt.utils.network.ip_addrs() to get the system's IP addresses to match
against those which are connected. If it can't get the IP addresses,
then the manage.joined runner returns an empty list, and the test suite
believes that no minions have connected, and the function that
periodically runs manage.joined will eventually time out.

This commit adds messages to the console when no suitable gitfs provider
is installed, and when salt.utils.network.ip_addrs() returns an empty
list, to hopefully prompt the user to install the missing requisites.
2017-02-25 19:49:44 -06:00
twangboy
f43445d3de Fix test_rendering_includes for Windows 2017-02-24 15:28:03 -07:00
twangboy
34659761e8 Add issue number to skipIf 2017-02-24 09:31:47 -07:00
twangboy
e50ae8dd37 Fix wheel tests 2017-02-24 09:31:47 -07:00