Colton Myers
274464a85b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/reactor/index.rst
salt/cloud/clouds/digital_ocean_v2.py
salt/modules/groupadd.py
salt/modules/localemod.py
salt/modules/mysql.py
salt/modules/useradd.py
salt/modules/win_pkg.py
salt/modules/win_useradd.py
salt/netapi/rest_cherrypy/app.py
salt/pillar/s3.py
salt/returners/local_cache.py
salt/states/htpasswd.py
salt/states/user.py
2015-09-14 14:39:03 -06:00
rallytime
d4ad42d697
Update Joyent Cloud Tests
2015-09-04 12:23:05 -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
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
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
7b594ef6d6
Use an available image to test against
2015-08-24 15:12:19 -06:00
rallytime
1401255287
Use an available image to test against
2015-08-24 11:45:28 -06:00
rallytime
b68e3c0d0c
Update the Azure Cloud Provider tests to be more acurate and use newer azure SDK version
2015-06-25 15:14:21 -06:00
rallytime
e89564c775
Update Rackspace cloud test file to be more accurate
2015-06-22 10:18:52 -06:00
Nicole Thomas
6fa7e5c5f2
Merge pull request #24833 from rallytime/fix_linode_tests
...
Fix linode cloud tests
2015-06-20 14:15:09 -06:00
rallytime
c56d3150ec
Fix linode cloud tests
2015-06-19 10:55:12 -06:00
rallytime
4a0626bf27
Python 3 compat fix
2015-06-18 18:42:04 -06:00
rallytime
5c137c86ad
Make the GoGrid Cloud Provider Tests work
2015-06-18 17:08:57 -06:00
rallytime
7146871d73
Revert "Remove key management test from digital ocean cloud tests"
...
This reverts commit 1d031caa78
2015-05-22 15:33:40 -06:00
Colton Myers
d7362bb5dd
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/states/file.py
salt/utils/event.py
2015-05-22 13:02:54 -06:00
rallytime
1d031caa78
Remove key management test from digital ocean cloud tests
...
The create_key function was added to develop, but isn't present in 2015.5.
2015-05-21 13:37:34 -06:00
rallytime
dce9b540a6
Remove extra line
2015-05-18 14:49:27 -06:00
rallytime
4acf58e758
Switch digital ocean tests to v2 driver
...
This has been done on develop, but this handles the cloud test failures for 2015.5.
2015-05-18 13:44:08 -06:00
rallytime
7e15ff94ff
Move digital_ocean_v2 tests to be the defauly/only tests for digital ocean cloud tests
2015-05-14 15:25:00 -06:00
Tomas Sirny
5d93b7619d
Working test for extended profile
2015-04-17 15:40:08 +02:00
Damian Myerscough
f51fd0349a
Fix pylint error
2015-04-10 23:16:20 -07:00
Damian Myerscough
c6e618bc5f
Digital Ocean APIv2 Integration Testing
2015-04-10 21:30:09 -07:00
Thomas S Hatch
0da8878b90
lint
2015-03-09 11:02:25 -06:00
Thomas S Hatch
d789f263c4
Merge branch 'cloud-gce-tests' of https://github.com/junckritter/salt into junckritter-cloud-gce-tests
2015-03-09 11:00:10 -06:00
Tomas Sirny
daf06c1ab6
Credit for test
2015-03-09 09:38:29 +01:00
Tomas Sirny
494d7069fd
Working basic test for GCE cloud provider
2015-03-08 23:16:36 +01:00
rallytime
d9d30cc855
Pylint fix
2015-03-05 10:31:13 -07:00
rallytime
dbdc12fe11
Python 3 compat for joyent integration test file
2015-03-04 16:11:45 -07:00
Justin Findlay
cfd03959d5
fix develop lint
2015-03-03 23:28:56 -07:00
Erik Johnson
94d55889d7
Resolve merge conflicts
2015-02-28 12:35:25 -06:00
rallytime
eceadb82b1
Move tearDown functionality into test_instance
...
The new functions don't need to perform the tearDown behavior,
so that insurance should just be moved the function that needs it.
2015-02-27 14:53:54 -07:00
rallytime
14f4d28cd6
Add some more tests to catch API changes for digital ocean
2015-02-27 14:53:54 -07:00
Nicole Thomas
c2ca579906
Merge pull request #20965 from rallytime/joyent_cloud_tests
...
Add Joyent cloud provider tests
2015-02-27 14:42:08 -07:00
Pedro Algarvio
62f868a076
Merge branch '2015.2' into develop
2015-02-27 10:02:47 +00:00
rallytime
e5c4cf8ab4
Move tearDown functionality into test_instance
...
The new functions don't need to perform the tearDown behavior,
so that insurance should just be moved the function that needs it.
2015-02-24 16:42:00 -07:00
rallytime
b2bc55f150
Add some more tests to catch API changes for digital ocean
2015-02-24 16:33:31 -07:00
rallytime
95d4fb801c
Skip the ec2 nightly cloud tests for now
...
Something fundamental has changed with the way ec2 interacts with
the test runner starting in 2015.2 (and consequentially develop).
Let's skip these tests for now until we can pin down why so we don't
muddy the cloud-testing waters.
2015-02-24 16:07:23 -07:00
rallytime
e26cac4599
Pylint fix
2015-02-24 10:58:39 -07:00
rallytime
b51492486f
Add Joyent cloud provider tests
2015-02-20 17:25:07 -07:00
Pedro Algarvio
dc2d3b8ba2
The imports do work!
2015-01-30 22:25:29 +00:00
Pedro Algarvio
eca6f730db
Py3 compatibility fixes
2015-01-30 22:25:08 +00:00
Pedro Algarvio
207f3ddbf1
Py3 compatibility fixes
2015-01-30 22:25:08 +00:00
