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
Thomas S Hatch
ca77c58b41
Merge pull request #7942 from kretz/rbenv-support-in-gem
...
Support gem execution with rbenv ruby.
2013-10-18 09:59:55 -07:00
Martin Kretz
2e1db23b15
Added testcases to suppor rbevn in gem.
2013-10-18 13:44:45 +02:00
Thomas S Hatch
fef1647e97
Merge pull request #7889 from holmboe/virt-tmpl-refactor
...
Templating refactor in virt.py
2013-10-17 11:09:34 -07:00
Pedro Algarvio
9181ac81b9
Update the alternatives mocked unit tests to the new python_shell argument to cmd.
2013-10-16 23:43:27 +01:00
Pedro Algarvio
db670d1357
Don't fail if process already killed.
2013-10-16 23:27:19 +01:00
Pedro Algarvio
badf339b01
Improve code readability.
2013-10-16 21:51:51 +01:00
Henrik Holmboe
aa1bfc8947
Use same unit as input
2013-10-16 21:16:48 +02:00
Henrik Holmboe
f5fa6afe83
Add another unit test for disk controller
2013-10-16 21:10:59 +02:00
Henrik Holmboe
4460ed4d69
Add unit test for disk controller
2013-10-16 21:06:26 +02:00
Henrik Holmboe
fb569991b5
Add unit test for boot device
2013-10-16 20:53:37 +02: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
Seth House
bd897c0bdb
Add unit test for the "python" jinja filter
...
Missing from c91fe1c#7866 ).
2013-10-16 09:24:40 -06:00
Seth House
54cc36566e
Added a pprint.pformat Jinja filter to match the file.serialize state
2013-10-16 09:23:14 -06:00
Henrik Holmboe
479050b5ee
Fix logic regarding telnet console and port
...
Provide a (temporary) default. Previously it was possible to skip
specifying telnet_port and it would result in a incomplete XML.
2013-10-16 17:20:47 +02:00
Henrik Holmboe
9add77a02a
Add unit test for tcp/telnet console
2013-10-16 17:04:11 +02:00
Henrik Holmboe
e29e0408b1
Make unit tests verify the disk entries in virt._gen_xml()
2013-10-16 16:05:09 +02:00
Henrik Holmboe
4345f3a126
assertEqual gives relevant information on fail
2013-10-16 10:18:03 +02:00
Henrik Holmboe
739a644a42
Use assertEqual, less to type
2013-10-16 10:14:50 +02:00
Henrik Holmboe
4e194c2782
Whitespace.
2013-10-16 10:08:28 +02:00
Henrik Holmboe
d4164d2eb7
Add unit test for virt._gen_vol_xml()
2013-10-16 09:58:37 +02: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
Thomas S Hatch
52f2b0feb7
Merge pull request #7858 from s0undt3ch/issues/6714
...
Test for the presence of a yaml parsing log message. Fixes #6714 .
2013-10-15 15:08:56 -07:00
Thomas S Hatch
c12ef31f16
Merge pull request #7855 from s0undt3ch/develop
...
Avoid unnecessary `KeyError`'s while testing.
2013-10-15 15:07:26 -07:00
Pedro Algarvio
9caffa11e7
Test for the presence of a yaml parsing log message. Fixes #6714 .
...
Additionally, moved the yaml syntax error checking to the proper place.
2013-10-15 22:54:15 +01:00
Pedro Algarvio
1bf652541d
Avoid unnecessary KeyError's while testing.
2013-10-15 22:42:21 +01: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
