Pedro Algarvio
db58cbd8ca
Ignore import
2014-06-30 01:03:36 +01:00
Colton Myers
0c4b66aa8a
Merge pull request #13806 from whiteinge/rest_cherrypy-401-fix
...
Raise a 401 reponse instead of redirecting to the login page
2014-06-27 15:14:17 -06:00
Seth House
f18a636628
Raise a 401 reponse instead of redirecting to the login page
...
Also fixed bad tests that should have caught this.
Fixes saltstack/salt-api#155 .
2014-06-27 14:03:34 -06:00
Thomas S Hatch
a56bed4d03
Don't force import of salt.master in integration tests
2014-06-27 13:13:41 -06:00
Thomas S Hatch
13099a458e
Fix test where the arg passing should run through
...
parse input first
2014-06-26 21:48:59 -06:00
Aditya Kulkarni
b991977e69
Update expected message
2014-06-26 12:58:49 -04:00
Aditya Kulkarni
54110a9658
Fix paths
2014-06-26 10:18:58 -04:00
Nitin Madhok
6773a34c1f
Fixing pylint violations
2014-06-25 19:27:16 -04:00
Aditya Kulkarni
55c92b4eeb
Move master top file before test
2014-06-25 16:50:17 -04:00
Aditya Kulkarni
3a59cbf9cb
Add regression test for master_tops
2014-06-25 14:53:11 -04:00
rallytime
c001f717a4
Fix digital ocean provider integration tests
2014-06-24 14:33:15 -06:00
Pedro Algarvio
de4892b7ee
Reorder imports and don't even run setUp is expensive tests are not enabled
2014-06-23 01:00:42 +01:00
Pedro Algarvio
a283d52df1
Reorder imports and don't even run setUp is expensive tests are not enabled
2014-06-23 01:00:04 +01:00
Pedro Algarvio
99a8e05aa9
Reorder imports and don't even run setUp is expensive tests are not enabled
2014-06-23 00:59:27 +01:00
Pedro Algarvio
992cdc07b1
Reorder imports and don't even run setUp is expensive tests are not enabled
2014-06-23 00:58:39 +01:00
Pedro Algarvio
55cd462fa7
No need to iterate through keys
2014-06-21 15:34:33 +01:00
Pedro Algarvio
c952a4d61b
Remove unused import. White-space lint fix
2014-06-21 15:33:11 +01:00
Thomas Jackson
9d36f9f301
Add some basic tests for some of the globals noted in #12292
...
This is by no means complete (a lot of modules get __low__ or __env__ from their callers), but this will help catch some of the problems where we change the loader and the magic stops.
IMO we kinda need to overhaul the loader, and break out the module load, __virt__ running, packing of globals, and caching into seperate pieces
2014-06-20 19:00:10 -07:00
Seth House
66e2b54f36
Added encoding comment to empty init files
2014-06-19 17:37:44 -06:00
Seth House
d00cd104ac
And yet more pylint fixes
2014-06-19 17:25:56 -06:00
Pedro Algarvio
7590586d05
Don't fail on missing CherryPy
2014-06-19 13:00:38 +01:00
Seth House
53bab586f4
Merged salt-api into Salt
...
Woot!
The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.
Conflicts:
debian/changelog
debian/control
doc/conf.py
doc/index.rst
opt_requirements.txt
salt/config.py
salt/loader.py
2014-06-18 22:13:56 -06:00
Seth House
d526c9ec2b
Mock fire_event() in test to check auth setting
2014-06-18 16:52:14 -06:00
Mike Place
c4f5298d62
Create gitfs cache dir if does not exist
...
Should fix test suite
2014-06-17 12:04:53 -06:00
Mike Place
b278fcebff
Use sha1 hash for gitfs tests
2014-06-16 16:16:57 -06:00
Pedro Algarvio
9e1634d386
Patch the gitfs opts with custom opts and not master opts.
...
It worked but this was, as it was, it's more explicit
2014-06-15 13:25:21 +01:00
Pedro Algarvio
0a10c4d2c7
Turns out all we needed was the correct load
2014-06-15 13:24:39 +01:00
Pedro Algarvio
79d7918271
Add missing path key to the load.
...
Minor PEP-8, global variable `load` -> `LOAD`
2014-06-15 13:18:36 +01:00
Pedro Algarvio
edffec0159
Fix imports
2014-06-15 13:05:19 +01:00
Pedro Algarvio
7b017fe9ab
Skip test for now.
...
/CC: @cachedout
2014-06-15 13:05:19 +01:00
Pedro Algarvio
130788864f
Skip tests on missing empty_dir
2014-06-15 13:05:19 +01:00
Pedro Algarvio
b2f3cecea5
Copy the extension modules into the new master root_dir
2014-06-15 13:05:19 +01:00
Pedro Algarvio
bd35008d34
No need for late imports. Use AdaptedConfigurationTestCaseMixIn.
2014-06-15 13:05:19 +01:00
Pedro Algarvio
ccdd70750c
Leave any cleanup for the end
2014-06-15 13:05:18 +01:00
Pedro Algarvio
70f6a90ed6
Store evaluated configs as cls attributes
2014-06-15 13:05:17 +01:00
Pedro Algarvio
007f86b5d6
Remove stray print and commented out entries
2014-06-15 13:05:17 +01:00
Pedro Algarvio
d9ce87c04c
Call verify_env on transplant_configs
2014-06-15 13:05:17 +01:00
Pedro Algarvio
7fbc839942
Lay down computed configuration and use that source for all of the tests
2014-06-15 13:05:17 +01:00
Pedro Algarvio
97f150db74
Revert "detect the right transport for the client in tests"
...
This reverts commit d33b01d635
2014-06-15 13:05:17 +01:00
Pedro Algarvio
9fbc894f51
Revert "Cache the salt client"
...
This reverts commit b4786b0d8c
2014-06-14 19:19:44 +01:00
Pedro Algarvio
b4786b0d8c
Cache the salt client
2014-06-13 23:47:03 +01:00
Pedro Algarvio
da7e7d71dd
Merge pull request #13434 from rallytime/cloud_tests
...
Initial cloud provider tests for GoGrid
2014-06-13 01:08:30 +01:00
rallytime
276affe259
Initial cloud provider tests for GoGrid
2014-06-12 17:09:57 -06:00
Thomas S Hatch
d33b01d635
detect the right transport for the client in tests
2014-06-12 16:53:50 -06:00
Thomas S Hatch
46cdb04ada
Merge pull request #13422 from cachedout/publish_tests
...
Fix publish tests
2014-06-12 14:14:23 -06:00
Mike Place
616c3b5547
Fix failing test
2014-06-12 13:35:36 -06:00
Thomas S Hatch
525cd2a064
Use new client function
2014-06-12 12:41:00 -06:00
Thomas S Hatch
af1a21691a
Skip cleaning up syndic stuff so we don't have issues with raet tests
...
before the syndic stuff is all ready for testing
2014-06-12 12:35:24 -06:00
Thomas S Hatch
0b02be9af1
Initial code to do raet integration salt tests
2014-06-11 15:35:27 -06:00
Pedro Algarvio
f316a8242f
Merge pull request #13392 from rallytime/rackspace_cloud_tests
...
Rackspace with openstack driver cloud tests
2014-06-11 19:31:05 +01:00
