Commit Graph

1367 Commits

Author SHA1 Message Date
rallytime
148df32604 Merge branch '2016.11' into 'develop'
No conflicts.
2017-03-15 14:52:07 -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
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
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
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
0b41b92d7d
Use salt.utils.versions instead of distutils.version 2017-03-08 19:22:33 +00:00
Pedro Algarvio
b58241648a
Use the tests support paths module 2017-03-08 18:34:34 +00:00
Pedro Algarvio
b391a4eb5b
Supervisord does not work under Python 3 2017-03-08 18:34:33 +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
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
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
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
979090d225
We need bytes under Py3 to compute the hash 2017-03-02 19:56:04 +00:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00: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
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
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
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
Pedro Algarvio
15376697f9
Code cleanup 2017-02-24 00:49:33 +00:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest. 2017-02-23 23:19:42 +00:00
Erik Johnson
6e24dd85c4 Remove dockerio state/module (moved to salt-contrib) 2017-02-18 21:58:24 -06:00
Mike Place
deba6d2655 Merge pull request #39367 from gtmanfred/develop
add extmod_blacklist to make it easier to remove modules
2017-02-17 16:57:44 -07:00
twangboy
812c857770 Fix test_init for Windows 2017-02-16 16:00:45 -07:00
Daniel Wallace
d332b33c8a add extmod_blacklist to make it easier to remove modules 2017-02-15 12:47:32 -06:00
Pedro Algarvio
fc59d5e832 Python 3 Fixes (Pt. 2) (#39397)
* Typo in comment

* First convert to string if not already a string. Then to bytes under Py3.

The reason being that jids from the CLI, at least the one fed in
integration.runners.jobs.ManageTest.test_loopup_jid is loaded as an
integer, and, while the Py2 code converts JIDs to strings, under Py3, we
assume JID's are already strings.

* Mark tests which require root permissions to run

* Allow declaring that the function IS a class method.

```
Python 3.5.3 (default, Jan 21 2017, 00:29:12)
[GCC 6.3.1 20170109] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> class Foo:
...     def bar(self):
...         print('bar')
...
>>> import inspect
>>> inspect.ismethod(Foo.bar)
False
>>> inspect.ismethod(Foo().bar)
True
```

On Python 2, `inspect.ismethod` returns `True` for bound and unbound
methods while on Python 3 it only returns `True` for bound methods.
The explicit `is_class_method` is to avoid instantiating the class just
to get the function signature.

* Always decode responses to the Python version native string implementation

* Just compare the objects as matching list.

Asserting same item count doesn't make that much sense.

* Py3 compatibility

* Fix saltnado tests under Py3

* Python 3 compatibility

* Show me the full traceback

* Revert "Convert fileserver data from bytes to strings"

This reverts commit e53972f8c6.

* Revert "Under Py3, we get `bytes` when using the roots backend directly"

This reverts commit 9f73b240c1.

* Convert from bytes to str if not a binary file

* Py3 compatibility fixes.

Convert file contents from bytes to string if not a binary file
2017-02-14 16:20:56 -07:00
Mike Place
471baea629 Merge pull request #39381 from cachedout/docs_fix
Docs test fix
2017-02-14 10:53:27 -07:00
Mike Place
89ed6a38f7
Typo 2017-02-13 16:46:53 -07:00
Mike Place
8fbbb781bc
Fix docs test 2017-02-13 16:45:47 -07:00
mephi42
6570392abd Support globbing in sources parameter of salt.modules.archive (#32356)
Add globbing support to tar, zip and rar.
Update tests to show bad return value on error.
2017-02-14 00:02:19 +01:00
Erik Johnson
6ee6874e11 Set time back 1 week instead of up to 36 years in system module tests
This prevents git_pillar certificate errors. Additionally, sometimes
/dev/rtc becomes unresponsive which leads the ``hwclock --compare``
command to spin indefinitely, ultimately causing the entire test run to
fail. This changeset uses a SIGALRM handler to abort the hwclock command
if no output is seen within 3 seconds and try a second time. If it times
out the second time as well, then an error will be logged but it will
not be fatal to the test (or hang it indefinitely).
2017-02-12 23:57:28 -06:00
Nicole Thomas
050b4cc824 Protect hardware clock test comparison better (#39298)
In #39060, some tests were added to check for the hardware clock
getting reset when possible. The test attempted to gate the test
when access to the hardware clock was impossible, but the check
wasn't quite right and caused problems with the resulting tests.

This change makes the `has_settable_hwclock()` function public
in order to make the test gate work correctly. This function
could also be useful at the CLI level.

When running `self.run_function('status._has_settable_hwclock()')`
from the test suite, the return is a string noting that the
function is unavailable. This change allows for the `if not` check
to evaluate the return of the function.
2017-02-10 10:15:25 -07:00
Daniel Wallace
e38c5d296b fix pylint 2017-02-08 18:07:13 -06:00
Daniel Wallace
57ab8dd27b add integration test 2017-02-08 16:08:50 -06:00
rallytime
50b9ac6a6d Fixup docs that don't have a CLI Example
- log functions shouldn't be used at the CLI level: added to allow_failure in test
- Added example for status.proxy_reconnect
2017-02-07 13:40:01 -07:00
Mike Place
c48192beff Merge pull request #38781 from raazvvann/dev/rheghedu/nilrt_ip
Add network module for NILinuxRT: nilrt_ip.py
2017-02-06 12:30:43 -07:00
Heghedus Razvan
8408789511 Add network module for NILinuxRT: nilrt_ip.py
Connman is the network manager used as backend.
Functionalities:
  - ip.get_interface_details()
  - ip.up(interface)
  - ip.down(interface)
  - ip.set_dhcp_linklocal_all(interface)
  - ip.set_static_all(interface, address, netmask, gateway, domains)
  - ip.build_interface(interface, interface_type, enable, **settings)
  - ip.build_network_settings(**settings)
  - ip.get_network_settings()
  - ip.apply_network_settings(**settings)

Integration test for:
  - ip.enable
  - ip.disable
  - ip.set_dhcp_linklocal_all
  - ip.set_static_all

Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
2017-02-03 14:25:03 +02:00
rallytime
eb61788f87 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/runners/all/index.rst
  - salt/modules/win_lgpo.py
  - salt/states/dockerio.py
2017-02-01 16:36:45 -07:00
rallytime
a782b00ee1 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/cloud/clouds/openstack.py
2017-02-01 13:35:10 -07:00
Erik Johnson
d76f0380d0 add debug logging for batch vars 2017-02-01 00:05:21 -06:00
Erik Johnson
909916c78e Run test_valid_docs in batches
This test fails often due to being trimmed, thanks to
salt.utils.dicttrim trimming values > max_event_size.

This commit changes this test so that it runs sys.doc twice, ensuring
that the return from sys.doc (for now) is not trimmed.
2017-02-01 00:05:05 -06:00
Haris Okanovic
c5f832b9e3 system: Update hardware clock on date/time change
Update hardware clock so that date/time changes persist
through reboot.

Add hwclock check to system integration test. Bump tolerance
of _same_times() helper to account for longer run-time of set
operations. Updating hardware rtc's can take more than 2 seconds.

Signed-off-by: Haris Okanovic <haris.okanovic@ni.com>
Reviewed-by: Sergey Kizunov <sergey.kizunov@ni.com>
Reviewed-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Reviewed-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
2017-01-31 17:40:40 -06:00
Nicole Thomas
7c93bcbb2a Add one more option to "allow_failure" for doc test (#38998) 2017-01-27 09:43:04 -07:00
rallytime
089ad59b90 Update the vsphere execution module docs to satisfy failing doc test
- Added the "CLI Example:" syntax to function that were missing it
- Added docs to functions missing any docs and CLI examples
- Added to functions to allow_failure in sysmod test as needed
- Also adjusted the ordering of the allow_failure structure to make it
  easier to see which modules/funcitons were included (alphabetize)
2017-01-26 11:56:06 -07:00
rallytime
44d09b8606 Add 'travisci.parse_qs' to the allow_failures option
Fixes the `integration.modules.sysmod.SysModuleTest.test_valid_docs`
test failure which thinks a CLI example is needed.
2017-01-05 12:27:59 -05:00
rallytime
9ad362fbde Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/states/kapacitor.py
2017-01-03 10:17:18 -05:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
rallytime
29f45c192c Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/cloud/clouds/ec2.py
  - salt/modules/grains.py
2016-12-12 11:23:57 -07:00
rallytime
627242ab5d Merge branch '2016.3' into '2016.11'
Conflicts:
  - tests/unit/config/config_test.py
2016-12-09 11:45:14 -07:00
Denys Havrysh
a449980672 Correct cp.get_file_str docstring and add integration tests 2016-12-09 13:05:57 +02:00
Mike Place
cfc6f4b530 Merge pull request #38055 from whiteinge/sls-file-running-dict
Add the __sls__ field to the highstate output (the running dict)
2016-12-08 11:04:05 -07:00
Seth House
84dce83860 Switch type comparison to isinstance 2016-12-08 02:38:34 -07:00
rallytime
4998b8d116 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/peer.rst
  - doc/topics/reactor/index.rst
2016-12-07 16:31:11 -07:00
Nicole Thomas
9969544653 Account for case where vim install already exists and is at an older version (#38112) 2016-12-06 16:07:56 -07:00
Seth House
15826ca207 Add integration test for checking the type of the __sls__ field
We should add a bunch more of these for other fields. Or we should just
use Typings to define the return from the state functions. ^_^
2016-12-05 14:08:20 -07:00
Seth House
e4cf3931b3 Add integration test for the running dictionary structure
This will fail if we remove/rename any fields from the running
dictionary by accident.
2016-12-05 14:08:20 -07:00
Mike Place
b158bb6557
Fix gem test (develop) 2016-11-30 10:56:41 -07:00
Mike Place
1d221aa91c
Update gem test for 2016.11 2016-11-30 09:44:56 -07:00
Mike Place
894cca3427
Update test for new gem ver 2016-11-28 11:17:07 -07:00
rallytime
5f4a73f880 Merge branch '2016.11' into 'develop'
No conflicts.
2016-11-16 08:55:22 -07:00
twangboy
a0429cf839 Use nfsd instead of apsd for test_disabled 2016-11-15 09:44:42 -07:00
twangboy
053198aa45 Fix tab 2016-11-15 09:33:01 -07:00
Jenkins
384cf67de5 Use nfsd instead of apsd to test disabled 2016-11-15 09:25:28 -07:00
rallytime
0e332ab591 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/cli/batch.py
  - salt/cli/salt.py
  - salt/transport/client.py
  - salt/utils/vmware.py
  - tests/integration/modules/sysmod.py
2016-11-14 09:14:00 -07:00
Mike Place
4fab707bdd Merge pull request #37627 from cachedout/pr-36706
Exempt pip.iteritems from test_valid_docs test
2016-11-11 15:48:37 +13:00
Mike Place
94df2f8e6f
Exempt pip.iteritems from test_valid_docs test 2016-11-11 15:47:43 +13:00
Eric Radman
671cebfa30 Skip random.org tests for any communication failure
This test connects to random.org, which may throws the following error
on one network I manage:

ssl.SSLError: [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed (_ssl.c:590)

Other errors are possible, such as `socket.error`.  Since it is
difficult to anticipate the failure mode, skip these tests if https
communication provokes any exception.

Also, this is not a unit test--it's more of a system test. My
recommendation that we recategorize this as an integration test where
global IPv4 routing can more reasonably expected.
2016-11-10 07:48:24 -05:00
rallytime
8d3957f250 Merge branch 'carbon' into 'develop'
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
2016-10-28 11:58:41 -06:00
Mike Place
6cb7ce2c0f
Fix typo in pkg upgrade test 2016-10-28 20:23:26 +09:00
rallytime
70851807bd Merge branch 'carbon' into 'develop'
Conflicts:
  - salt/modules/status.py
2016-10-24 09:35:00 -06:00
rallytime
caa8fc9169 Merge branch '2016.3' into 'carbon'
Conflicts:
  - pkg/deb/salt-api.service
  - pkg/deb/salt-master.service
  - salt/client/__init__.py
  - salt/fileclient.py
  - salt/modules/cp.py
  - salt/modules/status.py
  - tests/integration/__init__.py
  - tests/integration/modules/cp.py
2016-10-21 15:50:03 -06:00
rallytime
db3150b3f1 Merge branch 'carbon' into 'develop'
Conflicts:
  - doc/topics/installation/windows.rst
2016-10-21 15:19:16 -06:00
Mike Place
f4ce268d51
Don't run ssh tests if we can't reach external server 2016-10-21 19:47:05 +09:00
rallytime
b445a5e579 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/cp.py
2016-10-19 18:24:04 -06:00
Denys Havrysh
d1ab98b459 cp.get_url: update usage doc and add tests for file:// URL with dest=None 2016-10-18 13:39:55 +03:00
Denys Havrysh
c7cf79e959 cp.get_url: add note and test for https:// URL with `dest=None` 2016-10-17 17:39:52 +03:00
Denys Havrysh
ff55f77179 cp.get_url: write more verbose docstring 2016-10-17 16:01:02 +03:00
Denys Havrysh
94a34a08ba cp.get_url: add integration tests 2016-10-17 15:46:49 +03:00
Erik Johnson
1caf1f6770 Use a default prefix for the mkstemp utils function (#37022)
* Move salt.utils.mkstemp() into salt.utils.files

Also use a default prefix

* update refs to salt.utils.mkstemp

* Update test to use new path to mkstemp helper func
2016-10-16 16:12:56 -06:00
rallytime
b7d9bf0281 Merge branch 'carbon' into 'develop'
No conflicts.
2016-10-14 12:06:31 -06:00
rallytime
a5ae737057 Skip pkg.upgrades test on distros other that Suse in 2016.3
Refs #36450 and #36980
2016-10-13 12:02:22 -06:00
rallytime
21921af9a7 Skip pkg.upgrade test if pkg install/upgrade has problems
Refs #36450
2016-10-13 11:57:27 -06:00
rallytime
0a5b1f5466 Merge branch 'carbon' into 'develop'
No conflicts.
2016-10-13 09:58:18 -06:00
rallytime
1d3aaf8097 Merge branch '2016.3' into 'carbon'
Conflicts:
  - doc/ref/configuration/minion.rst
2016-10-12 15:26:27 -06:00
rallytime
32829b9474 [yumpkg] Skip test_pkg_upgrade_has_pending_upgrades if there are no upgrades
yumpkg.list_upgrades returns an empty dictionary when no upgrades are available.
We need to check for this situation and skip the test if no upgrades are present.

Fixes the test failure on Fedora 24 on Jenkins currently, but also protects against
any potential failures for other RHEL-based distros that aren't currently failing
because "ret" is populated with a dictionary of upgrades.
2016-10-11 16:50:50 -06:00
rallytime
d07f5612ee Merge branch 'carbon' into 'develop'
No conflicts.
2016-10-10 10:18:02 -06:00
rallytime
f73bdf55c2 Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/ini_manage.py
  - salt/states/glance.py
2016-10-07 09:51:21 -06:00
Mike Place
34007be671
Merge branch 'carbon' into carbon_develop 2016-10-06 00:23:22 +09:00
Mike Place
53f1523cb8 Merge pull request #36790 from cachedout/pr-36727
Merge forward carbon to develop
2016-10-05 23:57:23 +09:00
Ethan Moore
2ad701784a add integration tests for retry state option 2016-10-04 20:06:59 +00:00
Mike Place
8ff69bf0c7 Merge pull request #36764 from cachedout/more_pip_test_fixing
Another bit of detection for failed pip tests
2016-10-04 22:05:29 +09:00
Mike Place
b9f5343449
Another bit of detection for failed pip tests
Don't bail out if the download failed for some reason on the remote end
2016-10-04 21:09:47 +09:00
Justin Findlay
b5fcca9983 modules.archive int tests: check for gzip, rar
Similar to 8733586.
2016-10-03 11:14:05 -06:00
C. R. Oldham
e6897da166 Skip test if we can't get an earlier package. 2016-09-30 17:30:21 -06:00
C. R. Oldham
8e68058877 Handle cases where the return dict from a pkg.upgrade might have a "changes" key. 2016-09-30 16:33:56 -06:00
rallytime
5d7b4e4511 Merge branch 'carbon' into 'develop'
Conflicts:
  - conf/master
  - doc/ref/configuration/logging/index.rst
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
  - salt/modules/gpg.py
2016-09-30 16:10:33 -06:00
rallytime
5904cc04c6 Skip cmd_unzip test if salt.utils.which('zip') isn't available
This test relies on running archive.cmd_zip in order to have something
to test running archive.cmd_unzip against. Some distros will have the
unzip binary available, but not the zip binary. We need to protect this
test against both so we don't have a false failure on trying to run
archive.cmd_zip.
2016-09-30 16:02:42 -06:00
Nicole Thomas
52276d37a1 Skip cmd_unzip test if salt.utils.which('zip') isn't available (#36722)
This test relies on running archive.cmd_zip in order to have something
to test running archive.cmd_unzip against. Some distros will have the
unzip binary available, but not the zip binary. We need to protect this
test against both so we don't have a false failure on trying to run
archive.cmd_zip.
2016-09-30 14:30:09 -06:00
rallytime
555ae9aa9b Merge branch '2016.3' into 'carbon'
No conflicts.
2016-09-30 10:13:39 -06:00
Mike Place
16f5bb70ec
Remove line that checks against unordered keys 2016-09-30 20:24:49 +09:00
Mike Place
0e9148293a
Fix error in test
Introduced in #36616

cc: @cro
2016-09-30 11:38:03 +09:00
rallytime
616aafa398 Merge branch '2016.3' into 'carbon'
No conflicts.
2016-09-29 11:47:48 -06:00
rallytime
112903ad7e Merge branch '2016.3' into 'carbon'
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/daemons.py
  - salt/client/ssh/__init__.py
  - salt/config/__init__.py
  - salt/modules/archive.py
  - salt/modules/cmdmod.py
  - tests/unit/states/service_test.py
2016-09-29 09:56:43 -06:00
rallytime
3e4ac617d3 Merge branch '2015.8' into '2016.3'
Conflicts:
  - tests/integration/cli/grains.py
  - tests/integration/files/file/base/issue-2068-template-str-no-dot.sls
  - tests/integration/files/file/base/issue-2068-template-str.sls
  - tests/integration/modules/pip.py
2016-09-29 09:15:26 -06:00
Mike Place
8cfe371a5a Merge pull request #36663 from cachedout/skip_pip_tests_on_download_fail
Fix error in pip test
2016-09-29 15:15:52 +09:00
Mike Place
0c7fb91dc5
Fix error 2016-09-29 15:14:37 +09:00
Mike Place
e3f8618982 Merge pull request #36662 from cachedout/skip_pip_tests_on_download_fail
Skip over tests where upstream pip isn't there
2016-09-29 15:12:26 +09:00
Mike Place
0bbc60ccd7
Skip over tests where upstream pip isn't there 2016-09-29 15:11:38 +09:00
Mike Place
f4906fe771
Fix test not to rely on external resources
We can still model the original issue without needing to call all the way out to pypi to do it.
2016-09-29 12:35:02 +09:00
Mike Place
d8a61eb9f6 Merge pull request #36616 from cro/zypper_fix_test
Zypper fix test
2016-09-29 11:26:22 +09:00
Justin Findlay
cc4d958557 modules.archive: add integration tests 2016-09-28 17:14:52 -06:00
C. R. Oldham
b618a5c07d Remove debugging 2016-09-28 16:26:56 -06:00
C. R. Oldham
3870589462 Test for pkg.upgrade. Most robust on Suse but better than nothing elsewhere 2016-09-27 14:50:44 -06:00
C. R. Oldham
867638ff48 Test for pkg.upgrade. Most robust on Suse but better than nothing elsewhere 2016-09-27 14:49:23 -06:00
Mike Place
4956d7d5a3
Merge branch '2016.3' into 2016_3_develop 2016-09-26 21:47:32 +09:00
rallytime
d5bbd91c14 Merge branch '2016.3' into 'carbon'
Conflicts:
  - conf/master
2016-09-23 17:01:17 -06:00
Nicole Thomas
fcc50c93fc Wrap the entire GrainsAppendTestCase class with destructiveTest (#36537)
Since all pieces of the GrainsAppendTestCase are destructive, let's
just wrap the whole class test case.

Because the tests themselves as well as the `tearDown` function were
wrapped in a @destructiveTest decorator, some test errors were printing
in the test output when --run-destructive isn't passed at the CLI.

This fixes those test errors.
2016-09-23 13:35:05 -06:00
rallytime
8e0b1a3718 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-22 10:09:06 -06:00
Erik Johnson
1c585b0ef6 Leave arguments as integers
This should be supported, and helped catch a bug in the extraneous
re-implementation of cmd.run_all that exists in salt.utils.mac_utils.
2016-09-21 11:46:54 -05:00
Justin Findlay
a20a2148bf skip some mac_timezone tests 2016-09-19 16:48:22 -06:00
rallytime
ee8321eab1 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-14 15:18:22 -06:00
rallytime
95dbe1ade4 Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/fileserver/__init__.py
  - setup.py
  - tests/integration/modules/git.py
2016-09-14 09:15:29 -06:00
Pablo Suárez Hernández
ed2d2bd331 Integration tests fixes for 2015.8 (#36262)
* Fixing integration tests if azure is not present

* Fixing integration tests failures if 'git' command is missing

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
2016-09-13 15:24:06 -06:00
Pablo Suárez Hernández
a0bbb0f648 Integration tests fixes for 2016.3 (#36263)
* Fix PillarModuleTest::test_pillar_items: 'info' does not exist in pillar

* Fixing integration tests if azure is not present

* Fixing integration tests failures if 'git' command is missing

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
2016-09-13 12:40:56 -06:00
rallytime
e385f55588 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-13 08:25:11 -06:00
Mike Place
3e2375c829 Merge pull request #36176 from twangboy/mac_service_tests
Fix test_launchctl test in mac_service
2016-09-13 16:31:46 +09:00
rallytime
87341ed30b Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-12 09:42:26 -06:00
Mike Place
7d25344574 Merge pull request #36194 from jfindlay/mac_timezone
skip some mac_timezone tests
2016-09-10 09:07:07 +09:00
twangboy
075ceb09ab Fix test_latest_version test 2016-09-09 14:14:51 -06:00
Justin Findlay
eaada10e89 skip some mac_timezone tests 2016-09-09 12:34:24 -06:00
twangboy
28442b32f8 Fix some lint 2016-09-09 08:47:51 -06:00
rallytime
2edfef33ae Merge branch 'carbon' into 'develop'
Conflicts:
  - salt/scripts.py
  - salt/thorium/key.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
2016-09-08 17:31:29 -06:00
twangboy
1c83b37fe6 Fix unquoted integers 2016-09-08 17:07:28 -06:00
twangboy
345cd7f9c1 Fix test_launchctl test 2016-09-08 16:30:35 -06:00
Thomas S Hatch
93d8a83271 Merge pull request #36086 from twangboy/mac_power_tests
Fix tests for mac_power module on various systems.
2016-09-08 14:52:37 -06:00
twangboy
b4112247a4 Fix test not starting, skip broken functions 2016-09-07 12:01:38 -06:00
Mike Place
ff04c162bd Skip Ruby tests on exception in pre-req check 2016-09-07 14:32:47 +09:00
twangboy
9e0f45785a Fix some lint 2016-09-06 15:02:02 -06:00
twangboy
ca414e01de Fix capitalization error in setUp and tearDown 2016-09-06 15:02:02 -06:00
twangboy
af3f70d877 Seperate sleep on power button test 2016-09-06 15:02:02 -06:00
twangboy
c2b42f69c1 Move test available into their own classes 2016-09-06 15:02:02 -06:00
twangboy
efb425781f Fix lint errors 2016-09-06 15:02:02 -06:00
twangboy
35dd0619cb Check string type 2016-09-06 15:02:02 -06:00
twangboy
701031ff40 Fix sleep_on_power test 2016-09-06 15:02:02 -06:00
twangboy
5e19d4664a Check the availablity of individual tests 2016-09-06 15:02:02 -06:00
twangboy
d0d36bb874 Fix syntax error (lint) 2016-09-06 15:02:02 -06:00
twangboy
9be71e5a5d Check for Desktop, fix some functions 2016-09-06 15:02:02 -06:00
Justin Anderson
e6b4dd651e Suse Useradd test fix (#36007) 2016-09-01 15:57:03 -06:00
Heghedus Razvan
1a38cc340c shadow: test set&delete password for root (#35929)
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
2016-09-01 11:25:44 -06:00
Megan Wilhite
8f7df39181 add onfail multiple test (#35968) 2016-08-31 20:40:36 -06:00
Nicole Thomas
5d5fdf973b Pylint fix for #35930 (#35950) 2016-08-31 13:26:14 -06:00
Heghedus Razvan
bf6e1fa097 Add integration test for groupadd module (#35930)
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
2016-08-31 13:21:07 -06:00
Mike Place
24920aa226 Shut down time sync before setting time in tests (#35900)
* Shut down time sync before setting time in tests

* Lint

* Revert "Lint"

This reverts commit 6e3e6b76908b2c79647c7840fc3981548b2d13fc.

* Lint fix (ugh)
2016-08-31 09:16:39 -06:00
Thomas S Hatch
407d164752 Add tests for #22558 (#35915) 2016-08-30 17:13:12 -06:00
Mike Place
248776d704 Merge pull request #35655 from raazvvann/dev/rheghedu/shadow
shadow module: fix return values && integration test
2016-08-24 17:12:02 +09:00
Heghedus Razvan
21c66afea4 Add integration test for shadow module
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
2016-08-23 15:34:56 +03:00
Mike Place
21ebc61fac Use random file instead of log file for cp test 2016-08-23 19:33:45 +09:00
Mike Place
187e04e109 Merge pull request #35653 from cachedout/set_computer_desc_retcode
Switch to retcode evaluation for set_computer_desc
2016-08-22 20:54:22 +09:00
Mike Place
6e1dcb94ec Account for differences in output 2016-08-22 20:54:03 +09:00
Mike Place
2708fbc6d2 Lint 2016-08-22 19:00:19 +09:00
Mike Place
19b77442ee Test a fix for the wheel test
I think that what is happening here is that we're using stale grains from a previous test. This should hopefully refresh them and allow this test to succeed.
2016-08-22 17:13:16 +09:00
Mike Place
5b75786208 Switch to using skipIf instead of a custom decorator 2016-08-22 16:36:51 +09:00
Mike Place
928a5fc3be Lint 2016-08-22 16:12:09 +09:00
Mike Place
034a353689 Use skipIf properly 2016-08-22 16:11:01 +09:00
Mike Place
844a7577db Remove disabled decorator 2016-08-22 16:04:13 +09:00
Mike Place
8e784c6e80 Merge pull request #35554 from cachedout/git_test_py3
Fix git module test for py3
2016-08-20 22:17:13 +09:00
Mike Place
b282d877e6 Merge pull request #35482 from raazvvann/dev/rheghedu/system-comments
Add linux support for {get,set}_computer_desc CONTINUED
2016-08-20 11:44:25 +09:00
Mike Place
b9673b8b35 Str subst 2016-08-20 10:58:45 +09:00
jmacfar
bd70a12ec6 Pass makedirs through to fileclient
Integration tests for get_url makedirs=True
2016-08-19 12:18:05 -05:00
Mike Place
38630455ec Don't open files in text files in binary mode in pip test (#35553)
Python 3 is picky about this sort of thing
2016-08-18 09:41:19 -06:00
Heghedus Razvan
46696794ab Add integration test for {get/set}_computer_desc
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
2016-08-18 17:03:26 +03:00
Mike Place
ca045f4feb Fix git module test for py3
Simple binary compat fixes in version compare
2016-08-18 19:56:00 +09:00
rallytime
49179ac401 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/win_pkg.py
  - tests/integration/files/conf/master
2016-08-16 12:52:20 -06:00
rallytime
c6c82be1de Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cloud/deploy/bootstrap-salt.sh
2016-08-16 11:02:05 -06:00
Mihai Dinca
b0f0b4effc Make sha256 the default hash_type 2016-08-15 10:02:19 +02:00
rallytime
a3a5496d0f Fix some items that went awry in the merge 2016-08-12 17:06:27 -06:00
rallytime
1fe0b69a6c Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/blockdev.py
  - salt/modules/ddns.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/linux_sysctl.py
  - salt/modules/status.py
  - salt/modules/x509.py
  - salt/utils/process.py
  - salt/utils/verify.py
  - tests/integration/__init__.py
  - tests/integration/modules/state.py
  - tests/integration/states/cmd.py
2016-08-12 16:21:58 -06:00
Mike Place
3646cf1afa Additional checks on master and integration test 2016-08-12 20:06:20 +09:00
rallytime
cf038ee3fe Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/grains/core.py
  - salt/modules/file.py
  - salt/modules/hosts.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/portage_config.py
  - salt/modules/x509.py
  - salt/scripts.py
  - tests/integration/shell/enabled.py
2016-08-11 11:33:54 -06:00
Erik Johnson
a375dd7e1f Clean up open filehandles (#35359)
* salt/crypt.py: clean up open filehandles

* salt/fileclient.py: clean up open filehandles

* salt/grains/core.py: clean up open filehandles

* salt/modules/cp.py: clean up open filehandles

* salt/modules/data.py: clean up open filehandles

* salt/modules/dnsutil.py: clean up open filehandles

* salt/modules/dockerng.py: clean up open filehandles

* salt/modules/inspectlib/collector.py: clean up open filehandles

* salt/modules/file.py: clean up open filehandles

* salt/modules/hosts.py: clean up open filehandles

* salt/modules/incron.py: clean up open filehandles

* salt/modules/dpkg.py: clean up open filehandles

* salt/modules/linux_sysctl.py: clean up open filehandles

* salt/modules/netbsd_sysctl.py: clean up open filehandles

* salt/modules/network.py: clean up open filehandles

* salt/modules/nftables.py: clean up open filehandles

* salt/modules/openbsd_sysctl.py: clean up open filehandles

* salt/modules/rh_ip.py: clean up open filehandles

* salt/modules/portage_config.py: clean up open filehandles

* salt/modules/status.py: clean up open filehandles

* salt/modules/tls.py: clean up open filehandles

* salt/modules/xapi.py: clean up open filehandles

* salt/modules/x509.py: clean up open filehandles

* salt/modules/virt.py: clean up open filehandles

* salt/modules/zcbuildout.py: clean up open filehandles

* salt/returners/local_cache.py: clean up open filehandles

* salt/utils/cloud.py: clean up open filehandles

* salt/states/pkgrepo.py: clean up open filehandles

* salt/states/x509.py: clean up open filehandles

* salt/transport/mixins/auth.py: clean up open filehandles

* salt/utils/__init__.py: clean up open filehandles

* salt/states/pkg.py: clean up open filehandles

* salt/utils/minion.py: clean up open filehandles

* salt/utils/openstack/nova.py: clean up open filehandles

* salt/utils/openstack/swift.py: clean up open filehandles

* salt/utils/process.py: clean up open filehandles

* salt/utils/templates.py: clean up open filehandles

* salt/utils/virt.py: clean up open filehandles

* tests/integration/__init__.py: clean up open filehandles

* tests/integration/cli/grains.py: clean up open filehandles

* tests/integration/client/standard.py: clean up open filehandles

* tests/integration/modules/hosts.py: clean up open filehandles

* tests/unit/utils/vt_test.py: clean up open filehandles

* tests/integration/shell/enabled.py: clean up open filehandles

* tests/integration/states/cmd.py: clean up open filehandles

* tests/integration/states/file.py: clean up open filehandles

* tests/integration/states/match.py: clean up open filehandles

* tests/unit/config_test.py: clean up open filehandles

* tests/unit/templates/jinja_test.py: clean up open filehandles

* tests/unit/utils/find_test.py: clean up open filehandles

* tests/integration/modules/state.py: clean up open filehandles

* Update dnsutil_test to reflect changes in fopen usage
2016-08-11 10:45:24 -06:00
Jeff
abb72e478f Revert b00b3c4 (but keep addition to allow_failure list in test_valid_docs()) 2016-08-06 20:10:06 +08:00
rallytime
807c1729ba PY3: Use assertCountEqual instead of assertItemsEqual
assertItemsEqual is deprecated in Python 3 and replaced by assertCountEqual
2016-08-04 15:13:08 -06:00
rallytime
2d5d5fe7f9 Don't try to hash unicode strings in PY3
Avoids: TypeError: Unicode-objects must be encoded before hashing
2016-08-04 15:13:08 -06:00
twangboy
8626a20942 Add missing docs and cli examples 2016-08-02 17:33:20 -06:00
twangboy
b00b3c4e65 Fix tests 2016-08-02 17:33:20 -06:00
Justin Anderson
8517ec9458 accurately check return dict 2016-08-02 10:39:21 -06:00
Justin Anderson
cc036ac907 fix test_wheel_with_kwarg 2016-08-02 10:39:21 -06:00
Mike Place
cfc66b848e Merge pull request #35115 from cachedout/fix_state_sync
Sync before state tests
2016-08-02 02:46:50 -06:00
Mike Place
57e6ea5e51 Merge pull request #35064 from twangboy/int_tests_useradd
Add useradd integration tests for Windows
2016-08-02 01:59:33 -06:00
Jeffrey 'jf' Lim
8ab96d9b50 Remove integration tests for sys.list_{functions,modules} 2016-08-02 12:09:56 +08:00
Mike Place
b5e556f3a3 Sync before state tests 2016-08-01 18:26:18 -06:00
twangboy
8eb97d08be Remove whitespace 2016-08-01 14:08:52 -06:00
Jeffrey 'jf' Lim
17a230a2e5 Tighten up test_list_modules_with_arg: should include "assertNotIn" too 2016-07-31 02:16:45 +08:00
twangboy
8e83757c78 Fix test_add_user_to_group 2016-07-29 12:07:14 -06:00
twangboy
35017d7241 Add useradd integration tests for Windows 2016-07-29 11:30:34 -06:00
Mike Place
ec821510bf Merge pull request #34909 from twangboy/int_tests_beacons
Add check for admin on Windows, gated
2016-07-29 10:39:28 -06:00
twangboy
2cb5787bad Remove linux gate 2016-07-29 10:24:29 -06:00
twangboy
402901aff0 Add check for admin on Windows, gated 2016-07-29 10:20:45 -06:00
twangboy
1607da0841 Better fix 2016-07-28 09:48:09 -07:00
twangboy
5ca2f15664 Fix test_issue_1896... for Linux 2016-07-28 09:33:23 -07:00
twangboy
55cb909f68 Fix two more tests for Windows 2016-07-27 15:17:36 -07:00
twangboy
3da842cea3 Put import in the right place 2016-07-27 11:21:20 -07:00
twangboy
e74fd599ce Add missing import salt.utils.win_functions 2016-07-27 11:17:16 -07:00
Mike Place
28268208f9 Merge pull request #34937 from twangboy/int_tests_cp
Fix test_list_minion for Windows
2016-07-27 08:53:45 -06:00
Mike Place
847d8ea95f Merge pull request #34939 from twangboy/int_tests_git
Fix git integration tests for Windows
2016-07-27 08:44:35 -06:00
twangboy
d0a96181e6 Clarify lowercase checking 2016-07-26 10:39:54 -07:00
twangboy
3c0cf59565 Fix lint 2016-07-26 10:34:54 -07:00
Shane Lee
84e2e8b101 Fix grains integration tests for Windows (#34941) 2016-07-26 10:49:10 -06:00
Shane Lee
c4131c0afb Skip inode test in Windows (#34938) 2016-07-26 08:59:47 -06:00
twangboy
a5537ad6b9 Fix test_init, add lower 2016-07-25 16:11:36 -07:00
twangboy
e50ce384c0 Fix git integration tests for Windows 2016-07-25 15:45:11 -07:00
twangboy
0f74afc257 Fix test_list_minion for Windows 2016-07-25 14:49:32 -07:00
Mike Place
baee2f2558 Config test no longer applies to new test config 2016-07-22 18:59:31 -06:00
twangboy
ff1fbce6ae Add check for admin on Windows, gated 2016-07-22 15:53:17 -07:00
Erik Johnson
e9be937d8f Fix incorrectly-written test
This was testing to confirm incorrect behavior. We should not be having
a leading zero when the setuid/setgid bit is set in the mode.
2016-07-20 15:33:11 -05:00
rallytime
39bc093ee9 Merge branch '2016.3' into 'develop'
No conflicts.
2016-07-19 10:31:07 -06:00
Justin Anderson
b94e0dd95a ipset.long_range doesn't need a docstring 2016-07-18 10:32:32 -06:00
rallytime
8b8e2a1dc3 CLI Example doc additions to fix the sysmod test failure 2016-07-14 17:34:02 -06:00
rallytime
f20e78b534 Merge branch '2016.3' into 'develop'
No conflicts.
2016-07-14 15:35:21 -06:00
rallytime
bb2c43b52a Merge branch '2016.3' into 'develop'
No conflicts.
2016-07-14 14:10:10 -06:00
rallytime
0c566dce89 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-07-14 14:06:42 -06:00
Mike Place
50360263c5 Adjust the mine test a little bit to give it a better chance of success (#34647) 2016-07-13 16:51:28 -04:00
Justin Anderson
dd1559a599 Check that mysqladmin exists before running mysql integration tests. 2016-07-13 11:08:26 -06:00
Megan Wilhite
f6dfbac5ca add num_cpus grain to freebsd (#34565)
* add num_cpus grain to freebsd

* fix pylint
2016-07-13 11:40:09 -04:00
rallytime
86b7c71e09 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/glusterfs.py
  - salt/states/pkg.py
2016-07-07 13:37:58 -06:00
Justin Anderson
0460edb9e2 Arch linux does not have osrelease or osmajorrelease grains (#34453) 2016-07-05 15:34:41 -04:00
Collin Richards
9d14d130fa Fix pylint issues 2016-06-30 10:46:35 -05:00
Collin Richards
72d47a67c0 Modify interface from utc boolean to utc_offset
The system set/get date/time functions now have
a utc_offset instead of a utc boolean so the time
can be set based off of any timezone.
2016-06-29 18:25:26 -05:00
Collin Richards
0866ee850e Remove _linux_set_datetime backend
Instead only use the date program as the backend.  This is much more
portable.
2016-06-29 18:24:50 -05:00
Collin Richards
69f8dd96ae Remove posix arguments 2016-06-29 18:24:49 -05:00
rallytime
cc83fa151a Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/status.py
  - salt/utils/__init__.py
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_vpc_test.py
2016-06-28 17:34:27 -06:00
Ch3LL
693cc61aa4 add osmajorrelease to ubuntu and fix pylint 2016-06-27 16:32:21 -06:00
Ch3LL
2fc3e8a54b add osmajorrelease grain for raspbian 2016-06-27 14:45:09 -06:00
Mike Place
1e5da4ba8f Merge pull request #34286 from Ch3LL/add_key_module_test
Add test for key module
2016-06-27 10:09:13 -07:00
Ch3LL
5f302d8205 Add test for key module 2016-06-24 16:24:21 -06:00
rallytime
8479c45728 Merge branch '2016.3' into 'develop'
No conflicts.
2016-06-21 17:29:44 -06:00
rallytime
318c2ed6a1 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/salt.py
  - salt/modules/grains.py
  - tests/unit/modules/boto_vpc_test.py
2016-06-21 16:03:31 -06:00
Mike Place
3669048654 Merge pull request #34077 from rallytime/grains-tests
Add some grains targeting tests
2016-06-21 09:06:30 -07:00
rallytime
b061b86946 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-06-20 17:22:07 -06:00