Pedro Algarvio
b82a051aef
Correctly trigger the issue reported on #8196 .
2013-11-06 22:49:29 +00:00
Pedro Algarvio
3477300d7f
Add a test case to check for proper env selection when passing ?env=foo. Refs #8196 .
2013-11-06 22:47:55 +00:00
Thomas S Hatch
a343e69d02
Merge pull request #8230 from s0undt3ch/issues/8196-environments
...
Properly pass `__env__` to states.
2013-11-06 14:23:26 -08:00
Pedro Algarvio
962f8d4149
Support adding files to the testing prod state env.
2013-11-06 20:18:47 +00:00
Pedro Algarvio
9a22d3053e
The pip module no longer accepts __env__ as a kwarg.
2013-11-06 20:15:23 +00:00
Pedro Algarvio
56129e3610
Include the holy directory for the __env__ selection test cases.
2013-11-06 20:04:54 +00:00
Pedro Algarvio
c170d1e572
Updated test cases to include environment selection in states using __env__.
2013-11-06 20:04:54 +00:00
Pedro Algarvio
0a03ecc6bc
Add required state file.
2013-11-06 20:04:10 +00:00
Pedro Algarvio
e334e232d1
Forgot to add the top file.
2013-11-06 20:04:10 +00:00
Pedro Algarvio
ec76b188b1
Correctly trigger the issue reported on #8196 .
2013-11-06 20:03:44 +00:00
Pedro Algarvio
2924f1c14a
Add a test case to check for proper env selection when passing ?env=foo. Refs #8196 .
2013-11-06 20:03:44 +00:00
Erik Johnson
5ef4b31e97
Include more information in test docstrings
...
This adds additional information that describes the relevant code being
tested, so that if there is a problem it is easier to trace it back to
where the problem lies.
2013-11-06 14:03:33 -06:00
Erik Johnson
3c799c0bd5
Add test for arguments with dashes in the arg name
2013-11-06 14:00:02 -06:00
Erik Johnson
f24fb7c26f
Add test for unsupported kwarg
2013-11-06 13:38:30 -06:00
Pedro Algarvio
c849c4b57f
Moved test cases from #8195 to a better place.
2013-10-31 18:54:25 +00:00
regilero
089787cead
Integration tests for #8174 , #7905 & #8114 : sls syntax errors
2013-10-31 14:30:25 +01:00
Pedro Algarvio
4b46ee5017
Remove unnecessary imports.
2013-10-26 18:59:44 +01:00
Pedro Algarvio
f96c01738e
Provide the loader integration tests in it's own package.
2013-10-26 18:57:00 +01:00
Pedro Algarvio
3bedf7c751
Some more tests within the test case.
2013-10-26 18:45:21 +01:00
Pedro Algarvio
ce553415cc
Provide test case to prove proper loader function override. Refs #8096 .
2013-10-26 18:06:28 +01:00
Henrik Holmboe
c10ed8ea60
Fix my typo
2013-10-24 11:42:52 +02:00
Henrik Holmboe
77fd1acb7f
Change assertEquals to assertEqual
...
According to
http://docs.python.org/2/library/unittest.html#deprecated-aliases
assertEquals is a deprecated alias of assertEqual.
2013-10-24 11:39:04 +02:00
Erik Johnson
95efdad8ba
Remove ubuntu 32-bit target
2013-10-20 21:47:05 -05:00
Erik Johnson
7984a8c2cf
Apparently the test framework doesn't like private member functions
2013-10-20 21:46:06 -05:00
Erik Johnson
81434578fc
Fix function name
2013-10-20 21:29:36 -05:00
Erik Johnson
1c0d279c59
Fix import error
2013-10-20 20:50:28 -05:00
Erik Johnson
9397840021
More tweaks to package tests
...
This makes package tests work better on CentOS 5, and also adds a 32-bit
target for Ubuntu.
2013-10-20 20:27:45 -05:00
Erik Johnson
90d6d045f1
Move _wait_for_pkgdb_unlock inside of PkgTest class
2013-10-20 18:48:01 -05:00
Erik Johnson
63ee0f1e83
Add function to wait for pkgdb lock to clear
...
Arch pkg tests that call pkg.latest_version seem to fail on running
this function due to the package database still being locked from
previous tests. This adds a function that waits (in 5 second increments)
for up to 60 seconds for the pkgdb to be unlocked.
http://jenkins.saltstack.com/job/salt-rs-arch/474/artifact/salt-runtests.log/*view*/
2013-10-20 18:18:35 -05:00
Erik Johnson
c5f5b400e9
adjust redhat pkg targets for pkg tests
2013-10-20 17:04:27 -05:00
Erik Johnson
62a9385ddf
Don't perform version spec pkg tests on FreeBSD
...
pkg_add does not support this, so this test will fail when
pkg.latest_version is run and an assertion is done to determine the
targeted version.
2013-10-20 16:00:14 -05:00
Erik Johnson
5dc08d552a
adjust pkg targets for pkg tests
2013-10-20 15:48:57 -05:00
Erik Johnson
fe1c4487e3
add tests for installing 32-bit packages
2013-10-20 15:16:36 -05:00
Erik Johnson
c7fcc79747
Add tests for pkg.installed with version specification
2013-10-20 14:35:10 -05:00
Erik Johnson
9d75d7a425
Change packages for pkg.installed tests on Debian-based systems
...
Travis-CI uses Debian/Ubuntu VMs and bzr is on their base image, so this
causes these tests to fail on Travis. This replaces bzr for tests on
Debian-based OSes.
2013-10-19 10:48:10 -05:00
Erik Johnson
0205f28e4a
Add pkg.installed tests
2013-10-19 09:50:48 -05:00
C. R. Oldham
66e3be46d1
Make sure multiple names clauses retain same order
2013-10-18 14:57:48 -06:00
Pedro Algarvio
db670d1357
Don't fail if process already killed.
2013-10-16 23:27:19 +01:00
Thomas S Hatch
bbd159f8a0
Not sure why we are removing a file from the source halfway in a
...
test, this should fix the failing test, @s0undt3ch, if this break
something I am not seeing please let me know
2013-10-16 12:17:59 -06:00
Thomas S Hatch
3143cb6e48
import skipif
2013-10-16 12:13:16 -06:00
Pedro Algarvio
40d70fb13f
os.getcwd() might thrown an OSError if it was deleted or moved.
...
Let's not fail because of that.
2013-10-16 17:32:22 +01:00
Pedro Algarvio
7de1cda6da
The test needs to be executed as root to pass.
2013-10-16 17:27:05 +01:00
Pedro Algarvio
9f29d0012e
Fix typo from 6bc5ea34.
2013-10-16 16:37:36 +01:00
Thomas S Hatch
aa584dc255
Add ret value to test return data
2013-10-15 17:05:04 -06:00
Thomas S Hatch
ca0e967c13
Assign the ret value
2013-10-15 17:03:12 -06:00
Thomas S Hatch
6bc5ea34e9
Ensure that the ports are integers
2013-10-15 16:59:44 -06:00
Thomas S Hatch
8612f7c007
Add ref to ret in test_7754
2013-10-15 16:34:17 -06:00
Colton Myers
3e565737c6
Merge pull request #7853 from s0undt3ch/issues/7754
...
Fix syslog logic checks for `file://`, `tcp://` and `udp://`. Fixes #7754
2013-10-15 14:22:43 -07:00
Pedro Algarvio
e72b4a3492
Fix syslog logic checks for file://, tcp:// and udp://. Fixes #7754 .
2013-10-15 22:09:37 +01:00
C. R. Oldham
8793429f72
Make sure that ssh keys don't get added with incorrect encoding types.
2013-10-15 11:48:28 -06:00
