Seth House
6d22514934
Rename the rest_cherrypy tests to conform to our convention
...
Previously they conformed to the default unittest2 convention.
2015-09-09 10:39:34 -06:00
Mike Place
1d5fd71fa3
Merge pull request #26880 from s0undt3ch/hotfix/26848-event-backwards-compat
...
Restore backwards compatibility to `salt.utils.event`
2015-09-03 17:04:45 -06:00
justinta89
1aadbdfc6b
Fixed lint error
2015-09-03 13:40:43 -06:00
justinta89
06bea434e1
fixed an unboundlocalerror
2015-09-03 13:16:36 -06:00
justinta89
8c42178e1a
Fixed a lint error
2015-09-03 10:21:41 -06:00
justinta89
5a33017791
Gets the azure version correctly on python-azure 1.0.0
2015-09-03 10:00:36 -06:00
Pedro Algarvio
00b9cc9a83
Only place salt's code root dir in sys.path, not anything above that
2015-09-03 10:49:01 +01:00
Erik Johnson
22341b3139
Add debug logging
...
This is a massive test function with steps dependent on each other.
These log messages make it easier to look through the log file to
troubleshoot failures.
2015-09-02 20:58:06 -05:00
Erik Johnson
37c8852584
Update git.config_set tests to use new state name
2015-09-02 20:58:06 -05:00
Colton Myers
3b696d97b3
Fix lint
2015-08-28 17:39:41 -06:00
Colton Myers
b509cdfa4b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
salt/cloud/clouds/gce.py
salt/cloud/clouds/linode.py
salt/grains/ssds.py
salt/modules/git.py
salt/modules/pip.py
tests/integration/cloud/providers/gogrid.py
tests/integration/cloud/providers/linode.py
tests/integration/cloud/providers/msazure.py
tests/integration/cloud/providers/rackspace.py
tests/unit/modules/pip_test.py
2015-08-28 16:33:54 -06:00
Colton Myers
964a47c643
Fix tests
2015-08-28 13:50:31 -06:00
Colton Myers
40718af1d5
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
doc/conf.py
salt/modules/win_service.py
tests/integration/cloud/providers/digital_ocean.py
2015-08-26 14:29:57 -06:00
rallytime
c0d83d558d
Don't use id as variable
2015-08-25 11:03:30 -06:00
rallytime
2b4bc1679d
Keep ec2 instance creation test the same - it works better for the ec2 output
2015-08-25 11:01:02 -06:00
rallytime
b5b58eb31f
Skip digital ocean tests since we can't use API v1 with v2 tests
2015-08-25 10:44:28 -06:00
rallytime
9ae1539c62
Update cloud tests to be more efficient and accurate
2015-08-25 09:49:32 -06:00
rallytime
e14931ff2d
Also add -Z to script args for cloud tests
2015-08-24 16:11:01 -06:00
rallytime
9ae27193d8
Also add -Z to script args for cloud tests
2015-08-24 16:02:26 -06:00
Nicole Thomas
2964700609
Merge pull request #26619 from rallytime/cloud-test-fixes
...
Apply cloud test fixes from 2015.5 to 2015.8
2015-08-24 15:49:33 -06:00
David Boucha
5522d87a11
Merge pull request #26603 from terminalmage/issue13550
...
Fixes for git.latest, git module integration tests, etc.
2015-08-24 16:47:16 -05:00
Nicole Thomas
ed166ebd4f
Merge pull request #26618 from rallytime/pip-undate-cloud-tests
...
Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests
2015-08-24 15:15:24 -06:00
rallytime
0d6eebf3c3
Extra lines
2015-08-24 15:12:31 -06:00
rallytime
c69c918b46
Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests
2015-08-24 15:12:25 -06:00
rallytime
7b594ef6d6
Use an available image to test against
2015-08-24 15:12:19 -06:00
rallytime
5a2c8825ba
Extra lines
2015-08-24 15:02:44 -06:00
rallytime
d28672b69e
Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests
2015-08-24 15:01:30 -06:00
rallytime
1401255287
Use an available image to test against
2015-08-24 11:45:28 -06:00
Erik Johnson
f033571d7e
No shell needed when checking git version
2015-08-24 11:32:51 -05:00
Erik Johnson
398f779d92
Add debug logging to troubleshoot worktree test failures
2015-08-24 10:44:08 -05:00
Erik Johnson
b9b44a3434
Don't set global user.name or user.email if they already exist
2015-08-23 23:43:12 -05:00
Pedro Algarvio
2f9b40ca25
Merge pull request #26577 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-23 08:14:04 +01:00
Colton Myers
667dfcee14
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/renderers/gpg.py
tests/integration/loader/loader.py
2015-08-21 16:44:59 -06:00
Jenkins
41541e4e2b
Fix many errors with __virtual__ in tests
...
Also stop using __salt__ in __virtual__ which is not guaranteed to exist
2015-08-21 14:01:03 -06:00
Erik Johnson
73537300cb
Lint fixes
2015-08-21 13:48:55 -05:00
Erik Johnson
e7099af0f6
Get rid of useless unit tests and add integration test for winrepo
2015-08-21 13:14:42 -05:00
Justin Findlay
2fee5708bb
Merge pull request #26501 from terminalmage/git_pillar_docs
...
Update git_pillar docs, add git.list_worktrees function
2015-08-20 23:34:02 -06:00
Erik Johnson
9a87f052d5
Update class name for old git pillar class
2015-08-20 10:39:36 -05:00
Erik Johnson
43fef21907
Add list_worktrees tests
2015-08-19 19:09:59 -05:00
Jenkins
9149cfbeb2
Fixing more tarfile tests on py2.6
2015-08-19 14:12:18 -06:00
Mike Place
ed71476ca2
Merge pull request #26477 from cachedout/fix_26_tarfile
...
Fix integration.modules.git.GitModuleTest.test_archive on py26
2015-08-19 11:34:06 -06:00
Jenkins
dbbe206e19
Fix integration.modules.git.GitModuleTest.test_archive on py26
...
Fix borrowed from: http://stackoverflow.com/questions/6086603/statement-with-and-tarfile
2015-08-19 11:31:38 -06:00
justinta89
c542895bd2
--annotate and --message aren't valid options in older versions of git.
2015-08-19 09:09:34 -06:00
Andreas Lutro
2f55d60293
git.latest: add test for no rev
...
technically, rename existing test and add a new simpler test with the
old name.
2015-08-18 16:38:24 +02:00
Erik Johnson
b7447fcadb
Fix git.clone tests to reflect new return data
2015-08-18 03:39:27 -05:00
Erik Johnson
8dc8eb4b41
Fix test_add_dir
...
Paths in the expected output needed to be relative, not full
2015-08-18 02:40:25 -05:00
Erik Johnson
7c9f2027f6
Remove usage of os.chdir except in setUp
...
Additionally, take measures to ensure that we chdir back to the original
cwd at the conclusion of the test.
A redundant test has also been removed, was likely a stray copypasta.
2015-08-18 02:15:21 -05:00
Erik Johnson
dd9bcc896e
Lint fixes
2015-08-17 22:10:39 -05:00
Erik Johnson
294aad298e
Add proper tests for git execution module
2015-08-17 22:10:39 -05:00
Mike Place
35d6ae2be7
Use with
2015-08-12 12:14:12 -06:00
