Aditya Kulkarni
edfabad5e2
Skip tests if no internet connection
2014-07-08 17:16:47 -06:00
Thomas S Hatch
b7a6200708
Merge pull request #14027 from pass-by-value/ext_pillar_12647
...
Make sure multiple git pillar sources work
2014-07-08 13:41:38 -06:00
Thomas S Hatch
f0724b3b41
Use salt.utils.process.clean_proc instead of the one in master.py
...
We need to clean up the master.py clean_proc so we only use one
2014-07-08 12:18:24 -06:00
Aditya Kulkarni
a7b52855d3
Make sure multiple git pillar sources work
2014-07-08 10:58:31 -06:00
Thomas S Hatch
09366515dc
Merge pull request #14016 from rallytime/fix_bad_copypaste
...
Fix typo in email from bad copy-paste
2014-07-07 16:16:47 -06:00
rallytime
d5c2a92d24
Fix typo in email from bad copy-paste
2014-07-07 16:12:11 -06:00
Thomas S Hatch
c1d151067d
verify the raet cacedir in tests
2014-07-07 15:56:16 -06:00
Pedro Algarvio
ed7d14e237
White-space lint fix
2014-07-05 00:45:53 +01:00
Pedro Algarvio
1ffb0e8a51
White-space related fixes
2014-07-04 00:56:49 +01:00
Pedro Algarvio
4acda7ab14
Move imports
2014-07-04 00:56:48 +01:00
Thomas S Hatch
07f55489b8
Merge pull request #13942 from cachedout/call_test_fix
...
Fix broken test.
2014-07-02 17:10:16 -06:00
Mike Place
51e3089a7c
Fix broken test.
2014-07-02 14:40:08 -06:00
Nitin Madhok
900021a820
Fixing lint in tests/integration/shell/auth.py
2014-07-02 16:11:49 -04:00
Thomas S Hatch
a985508513
Merge pull request #13902 from cachedout/auth_test_fixing
...
Fix failing auth test
2014-07-02 10:17:16 -06:00
Mike Place
a8c422da07
Just run useradd/userdel once
2014-07-01 17:04:16 -06:00
Thomas S Hatch
0dee0d82e9
Merge pull request #13901 from cachedout/fix_arg_test
...
Fix broken arg test
2014-07-01 16:57:46 -06:00
Mike Place
6e31fb42a0
Decorate teardown just to be sure
2014-07-01 16:40:32 -06:00
Mike Place
be07ccbd7c
Fix failing auth test
2014-07-01 16:38:30 -06:00
Mike Place
504378668c
Fix broken arg test
2014-07-01 16:07:59 -06:00
Mike Place
c3d0b5cba5
Dummy file to fix failing tests.
2014-07-01 15:58:01 -06:00
Mike Place
f9478a70f7
Fix all RAET publish tests
2014-07-01 15:13:52 -06:00
Thomas S Hatch
1b4736d5df
lint
2014-06-30 18:01:38 -06:00
Thomas S Hatch
50ee9dd5af
Merge pull request #13680 from pass-by-value/file_perms_no_exit
...
File perms no exit
2014-06-30 17:43:54 -06:00
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
Aditya Kulkarni
8ee2e01092
Change from auto to pam
2014-06-24 14:17:54 -04:00
Aditya Kulkarni
79c55a4784
Make sure tests pass on the right setup
2014-06-24 14:13:30 -04:00
Aditya Kulkarni
2836600b87
Add tests for pam auth
2014-06-24 14:13:30 -04:00
Aditya Kulkarni
909213ab1f
Add CLI options for username and password
2014-06-24 14:13:30 -04: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
