Commit Graph

7333 Commits

Author SHA1 Message Date
kevin
1865b13645 Fix 'present' option when used without 'key_type' 2016-11-14 12:16:51 -07:00
Mike Place
305e51d1c0 Merge pull request #37625 from cachedout/issue_37492
Return with proper retcodes in batch mode
2016-11-12 20:29:09 +00:00
Mike Place
b14faf1c68 Merge pull request #37611 from jeanpralo/fix-cmd-batch-raw
Fix cmd batch raw
2016-11-11 15:53:58 +13: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
Jean Praloran
4f16840ef1 add integration test for salt.client.LocalClient.cmd_batch 2016-11-11 14:20:51 +13:00
Mike Place
b6031524e5
Return with proper retcodes in batch mode
Check for the highest retcode received in batch mode and exit with it.

Also, an integration test for the same.

Closes #37492
2016-11-11 14:03:29 +13:00
Erik Johnson
2810b85cac Add a test to ensure we don't check for fast-forward before fetching (#37571) 2016-11-09 12:43:25 -07:00
Erik Johnson
2fc0b222bc Fix regression in service.dead state (#37562)
* Fix regression in service.dead state when service is not available

This was originally broken in c4f899b.

* Add unit test for issue 37511
2016-11-08 14:58:33 -07:00
Nicole Thomas
453319b50a Don't pass the vpc id to boto.vpc.create_internet_gateway func (#37556)
That function's namespace looks like this:
```
def create_internet_gateway(self, dry_run=False):
```
So when we pass in the vpc_id opbject in the test, the check later
in the function sets `dry_run=True` since the vpc_id opbject exists.

This later throws JSONResponseErrors because the `DryRun` flag is
set. This error raising functionality was added in the most recent
version of moto, which exposed this bug.

This fixes the three boto_vpc_test unit state tests. We'll see if
other tests need to be addressed in other files on a full test run.
2016-11-08 12:48:26 -07:00
Mike Place
be93710fee Merge pull request #37452 from rallytime/fix-31135
file.line with mode=replace on an empty file should return False, not stacktrace
2016-11-06 14:55:11 +13:00
Erik Johnson
a3f38e5a9f Update file.extract_hash unit tests
These tests now not only test the new functionality added for matching
on source URI and source_hash_name, but also test non-specific hash_type
lookups, specific hash_type lookups, and failed specific hash_type
lookups (i.e. requesting a hash type not present in the file).
2016-11-04 11:25:54 -05:00
Mike Place
580eca709b Merge pull request #37121 from nevins-b/2016.3
allow the file.recurse state to support saltenv
2016-11-04 18:59:28 +13:00
rallytime
94a00c66eb Write a unit test demonstrating stack trace in #31135
Here is the stack trace that happens when running file.line with
mode=replace on a file that exists, but is empty, as described in
the bug report:

unit.modules.file_test.FileModuleTestCase.test_replace_line_in_empty_file  .................................................
   Traceback (most recent call last):
     File "/root/SaltStack/salt/tests/unit/modules/file_test.py", line 593, in test_replace_line_in_empty_file
       mode='replace'))
     File "/root/SaltStack/salt/salt/modules/file.py", line 1523, in line
       for line in body.split(os.linesep)])
   TypeError: expected a character buffer object
2016-11-03 14:57:10 -06:00
Pablo Suárez Hernández
ffc596f215 Including resolver params for Zypper debug-solver
Now '--no-allow-vendor-change' and '--from' parameters are included
into the zypper --debug-solver call before performing a dry-run dist-upgrade.
2016-11-03 08:34:26 +00:00
Aditya Kulkarni
e9b4620fac Add unit tests for cloning from snapshot (#37414) 2016-11-02 11:22:37 -06:00
rallytime
e082ff538b Fix failing test now that we're raising a CommandExecutionError
Also adds a test to check that the CommandExecutionError is raised
when the filename is not present.
2016-11-01 15:51:09 -06:00
rallytime
fd380c79b9 Add test case to reproduce dnsmasq.set_config failure in #34263 2016-11-01 14:31:14 -06:00
Thomas S Hatch
1a4833b3a1 Merge pull request #37279 from gtmanfred/2016.3
initialize super class of NamespacedDictWrapper
2016-11-01 09:12:49 -06:00
Mike Place
a6b7417fe9
SIGILL -> SIGKILL in process test
Fairly sure this was a typo. cc: @s0undt3ch
2016-10-31 20:54:42 +13:00
Daniel Wallace
597f346d57 initialize super class of NamespacedDictWrapper
Fixes #37264
2016-10-27 14:28:01 -05:00
Mike Place
760ed9f56d Merge pull request #37239 from Ch3LL/fix_cloud_timeout
Fix cloud tests timeout
2016-10-26 10:11:52 +09:00
Ch3LL
394fccf556 fix run_cloud timeout 2016-10-25 13:30:41 -06:00
Ch3LL
23947c5944 change timeout for cloud tests 2016-10-25 13:27:57 -06:00
Eric Radman
3829b7592f Update configuration examples for Joyent
* Fix typo in profile example ('private_key' listed twice)
* Reflect Joyent's current new naming convention for VM sizes
* Update docs with modern images that are officially supported by Joyent
* Refresh example output of --list-sizes and --list-images
2016-10-25 10:43:32 -06:00
Nevins Bartolomeo
99d2c360ed making messaging in tests match new return 2016-10-25 09:38:54 -04:00
Mike Place
0bbf06bd86
Lint fix 2016-10-25 16:53:18 +09:00
Mike Place
f609917760
Workaround for utils 2016-10-25 16:51:30 +09:00
Mike Place
a6a24c2b3b
Workaround for tornado test startup error 2016-10-25 16:45:32 +09:00
Mike Place
88bcfa2c0a
Fix TCP test 2016-10-25 16:42:50 +09:00
Mike Place
c4393d5e9e
Address transport test hang
It would appear that if an attribute error is raised when trying to detect a class atter,
that the test suite does not run the class teardown method but continues regardless. This
fixes the class attr error which then allows the teardown to run. Prior to this, if the
teardown did not run, the entire suite would hang out shutdown because it was blocked
on waiting for a ioloop to terminate.
2016-10-25 13:16:35 +09:00
Nicole Thomas
d7e28d24a4 Pylint fix for 2016.3 (#37186)
Refs #37175
2016-10-24 09:42:41 -06:00
Mike Place
0d7af935e5 Merge pull request #37175 from cachedout/fix_test_hange
Fix test hang
2016-10-24 18:55:37 +09:00
Mike Place
0fecb5ff2e
Remove sleep. Thanks @s0undt3ch 2016-10-24 18:38:49 +09:00
Mike Place
cedc609503
Fix test suite hang on salt testing
We don't need to clean up here since the test suite will handle it for us.
2016-10-24 15:52:33 +09:00
Mike Place
c5d81a8ade Merge pull request #37158 from jfindlay/mac_skip_uptime
add mock for `status.uptime` unit test
2016-10-24 12:13:53 +09:00
rallytime
8fff95b3b4 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/gpg.py
  - salt/modules/zypper.py
2016-10-21 16:09:17 -06:00
Justin Findlay
094eac06eb modules.status.uptime unit test: mock on linux 2016-10-21 15:50:42 -06:00
Nicole Thomas
2bc5dedd06 Allow the minion test daemons a couple of tries to connect to the master (#37150)
When running the tests with the tcp transport, we are not as forgiving
with the minion connection process as we are in ZMQ. In ZMQ, we attempt
to connect to the master. If it isn't up yet, we wait and try again. In
TCP, we try to connect to the master once, realize it's not up (because
the master process takes longer to spin up than the minions) and crash
and bail out.

This just gives the master a little more time to come up by having the
minions try to connect a couple more times.
2016-10-21 14:50:39 -06:00
Nevins Bartolomeo
bc4b0e7cda adding test for saltenv in file.recurse source url 2016-10-21 08:44:58 -04:00
Mike Place
169a82e62b Merge pull request #37119 from jfindlay/log_proc_user
log.setup: only assign user if defined
2016-10-21 14:14:55 +09:00
Megan Wilhite
f22c686b34 fix digital ocean image name in profile (#37126)
* fix digital ocean image name in profile

* remove skip and fix test
2016-10-20 16:08:50 -06:00
Justin Findlay
1d503f032c tests.integration: pass opts as a dict 2016-10-20 14:16:35 -06:00
Nicole Thomas
8c46d69251 Merge pull request #37109 from meaksh/zypper-distupgrade-support-2015.8
Some improvements for Zypper `dist-upgrade`
2016-10-20 13:41:08 -06:00
twangboy
f1c8d98119 Skip weird_install test on Mac OS X 2016-10-20 11:05:34 -06:00
twangboy
90de794290 Fix test_issue_6833_pip_upgrade_pip test on OSX 2016-10-20 11:05:28 -06:00
Pablo Suárez Hernández
01b0a6917c Minor pylint fixes 2016-10-20 11:33:11 +01:00
Pablo Suárez Hernández
7dbb0bd252 Unit tests fixes 2016-10-20 10:59:48 +01:00
Mike Place
0b87e7890a Merge pull request #37103 from cachedout/fix_proc_test
Remove unnecessary sleep from unit.utils.process_test.TestProcessMana…
2016-10-20 17:45:07 +09:00
Mike Place
3a37a22366 Merge pull request #37088 from meaksh/zypper-distupgrade-support-2015.8
Adding 'dist-upgrade' support to the zypper module
2016-10-20 14:46:56 +09:00