Commit Graph

1519 Commits

Author SHA1 Message Date
Rahul Handay
a807d2c55b Adding git.py (states) unit tests 2015-04-07 15:05:25 +05:30
Justin Findlay
54c83e3fe7 Merge pull request #22380 from jayeshka/win_ip-unit-test
adding win_ip unit test case.
2015-04-06 07:39:32 -06:00
Jayesh Kariya
6c7ed37c87 adding win_ip unit test case. 2015-04-06 15:35:01 +05:30
Rahul Handay
37731bbfdf Adding win_system unit test cases 2015-04-06 14:16:38 +05:30
Nicole Thomas
b23dd2234d Merge pull request #22315 from rahulhan/event_unit_test
Adding states event.py unit tests
2015-04-03 06:30:58 -06:00
Nicole Thomas
cd69833731 Merge pull request #22318 from jayeshka/twilio_notify-unit-test
adding twilio_notify unit test case.
2015-04-03 06:30:13 -06:00
Rahul Handay
a572f3cadc Adding nova.py unit tests 2015-04-03 14:40:46 +05:30
Jayesh Kariya
57925820ed adding twilio_notify unit test case. 2015-04-03 14:29:49 +05:30
Rahul Handay
034386e855 Adding states event.py unit tests 2015-04-03 11:24:47 +05:30
Justin Findlay
e48df011fa adding alias state unit tests 2015-04-01 22:12:33 -06:00
Colton Myers
0269f3d544 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-30 09:30:58 -06:00
Evan Borgstrom
181df2e489 Fix a bug with the implicit list handling in pyobjects requisites
When specifying a requisite and you only need to list a single item you
can specify it without being wraped in a list and we will handle it
automatically.  This was being handled when we built our attrs to output
the final data, but this failed when you extended a require requisite
inside of a context manager.
2015-03-27 21:04:00 -07:00
Evan Borgstrom
247d38d1da This fixes #21796
From the Python docs on the exec statement:

> Remember that at module level, globals and locals are the same dictionary.
> If two separate objects are given as globals and locals, the code will be
> executed as if it were embedded in a class definition.

We were providing a specific object for locals and in the specific case
reported in #21796 this caused a very strange name error when used in a
specific way. By removing the explicit locals dictionary and just having the
globals dictionary be shared fixes the issue, and we weren't using the
specific locals anyway.
2015-03-21 08:03:12 -07:00
Evan Borgstrom
3223a15f83 This fixes #21796
From the Python docs on the exec statement:

> Remember that at module level, globals and locals are the same dictionary.
> If two separate objects are given as globals and locals, the code will be
> executed as if it were embedded in a class definition.

We were providing a specific object for locals and in the specific case
reported in #21796 this caused a very strange name error when used in a
specific way. By removing the explicit locals dictionary and just having the
globals dictionary be shared fixes the issue, and we weren't using the
specific locals anyway.
2015-03-21 07:58:14 -07:00
Colton Myers
18ab3f8275 Is it the underscore of doom? 2015-03-20 13:06:16 -06:00
Colton Myers
d89d8f5d2d Add the trailing slash 2015-03-20 11:55:45 -06:00
Colton Myers
4eee083691 Reorder mocked arguments 2015-03-20 10:36:25 -06:00
Colton Myers
2b1f400ab4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/topics/topology/syndic.rst
    salt/client/__init__.py
    salt/daemons/masterapi.py
    salt/minion.py
    salt/modules/dockerio.py
2015-03-19 16:03:29 -06:00
Colton Myers
e386db2c34 Update syndic_config test for new cachedir 2015-03-19 11:33:09 -06:00
Colton Myers
04b2125581 Update syndic_config test for new cachedir 2015-03-18 15:17:39 -06:00
Thomas S Hatch
55a35c809d Merge pull request #21755 from jacksontj/2014.7
Add timeout to saltnado's event listener
2015-03-18 11:49:38 -06:00
Thomas Jackson
234d02b218 Add timeout to saltnado's event listener
Fixes #21707

The issue is basically that the master has seen N minions-- and not all N are currently connected. The publish job returns to the salt-api that N minions got the job-- and it dutifilly waits for all the returns. With this we use the same ping timeout that the CLI does while waiting for returns. So once all minions are no longer running the job we will return.
2015-03-18 08:09:41 -07:00
Justin Findlay
5f143ecb60 unit tests for states.archive.extracted tar opts
Implements tests for #20795.
2015-03-17 20:40:20 -06:00
Thomas Jackson
205787c256 Add timeout to saltnado's event listener
Fixes #21707

The issue is basically that the master has seen N minions-- and not all N are currently connected. The publish job returns to the salt-api that N minions got the job-- and it dutifilly waits for all the returns. With this we use the same ping timeout that the CLI does while waiting for returns. So once all minions are no longer running the job we will return.
2015-03-17 19:17:32 -07:00
Justin Findlay
53c9d48331 fix typo 2015-03-17 19:58:05 -06:00
Colton Myers
065f573bad Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    salt/master.py
2015-03-17 13:35:32 -06:00
Alexander Schwartz
5f11f7b74c added tests to ensure commands are created accordingly (without additional single quotes) 2015-03-16 14:49:09 -06:00
Thomas S Hatch
cc9d294fcd Merge pull request #21569 from basepi/merge-forward-2015.2
Merge forward from 2014.7 to 2015.2
2015-03-12 13:36:39 -06:00
Colton Myers
bdfdd3f232 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	salt/modules/virt.py
2015-03-11 16:09:57 -06:00
Colton Myers
ebe7eeafd9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	doc/conf.py
	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-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
	salt/cloud/clouds/linode.py
	salt/states/composer.py
	salt/states/win_update.py
2015-03-11 15:14:56 -06:00
Thomas S Hatch
4873382184 Merge pull request #21487 from rallytime/bp-21469
Backport #21469 to 2014.7
2015-03-11 15:05:08 -06:00
Mike Place
debc936d29 Re-align test for saltclienterror exception 2015-03-11 13:43:55 -06:00
Ross Perkins
d473408074 composer.install module does not support always_check, only the state does. Removing the test on the module. 2015-03-11 12:19:17 -07:00
Ross Perkins
3f3218d853 Fix for issue #21491 2015-03-11 11:33:39 -07:00
Ross Perkins
8083cf554d Backport of PR #21358 to 2014.7 2015-03-10 09:38:16 -07:00
Vincent Desjardins
d5293901bc fixes #20198: virt.get_graphics and virt.get_nics calls in module virt 2015-03-10 09:17:48 -06:00
rallytime
b01196e7e8 Add transport key to mocked opts to fix batch unit tests 2015-02-27 14:53:58 -07:00
rallytime
cd5ad52c2e Fix pylint errors on develop 2015-02-26 09:43:52 +00:00
Pedro Algarvio
a24ae29ee9 Revert "We no longer warn."
This reverts commit 5d35f856ac.
2015-02-26 09:41:22 +00:00
rallytime
565f10959d Add transport key to mocked opts to fix batch unit tests 2015-02-25 13:51:25 -07:00
rallytime
c0cad91549 Fix unit test 2015-02-21 19:29:57 -07:00
jfindlay
59eaabea0a Merge pull request #20688 from rallytime/bp-20125
Backport #20125 to 2015.2
2015-02-13 11:46:21 -07:00
Mike Place
d1d52d2245 Avoid file cache problem in pydsl tests
Using the same copy of opts was causing the cache refresh to not find
any files because they had already been cleaned up!
2015-02-13 10:48:39 -07:00
Mike Place
7a9428d9f5 Typo 2015-02-13 10:17:17 -07:00
Mike Place
37b375ba8b Use cls attr 2015-02-13 10:17:17 -07:00
Mike Place
b9fa5e4e29 Reset env at end of test 2015-02-13 10:17:17 -07:00
Colton Myers
b2a80b195e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-12 11:44:57 -07:00
Thomas S Hatch
9e054f3890 Merge pull request #20616 from rallytime/merge-20419
Merge #20419 with test syntax fix
2015-02-12 10:38:53 -07:00
rallytime
6b2d64b557 Fix second pylint error that popped up 2015-02-11 22:07:37 -07:00
rallytime
789570fb94 Fix pylint/syntax of test in which_test to merge #20419 2015-02-11 21:48:34 -07:00