valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
37,718 Commits 24 Branches 182 Tags 341 MiB
b5aaa2b3e8
Commit Graph

2988 Commits

Author SHA1 Message Date
Thomas S Hatch
3ce4387f3f Merge pull request #16001 from thatch45/ssh_fsclient 
Ssh fsclient
 2014-09-23 14:41:28 -06:00
Thomas Jackson
ff0081b53d Remove "never timeout" feature 2014-09-23 13:35:11 -07:00
Thomas S Hatch
e2d640962a Fix Jinja test 2014-09-23 14:02:34 -06:00
vs
b804056b65 add expected output for denied minions to test_* 2014-09-23 17:36:06 +02:00
Pedro Algarvio
f547aeae41 Merge pull request #16033 from rallytime/fix_2014.7_tests 
Fix broken test on 2014.7
 2014-09-23 00:09:10 +01:00
Dave Rawks
a3707e2bab Simplify mock of cmd.run via setUp method 
* reduced code duplication by handling a frequently used mock in setUp
method to testcase
 2014-09-22 14:44:52 -07:00
Dave Rawks
8c0266486e Merge branch 'develop' of https://github.com/saltstack/salt into parted_tests 2014-09-22 11:35:41 -07:00
Dave Rawks
6e6bf0e643 First pass at adding unit tests to salt.modules.parted 
Full coverage for __virtual__, probe, and part_list
 2014-09-22 11:16:37 -07:00
rallytime
9c682933d4 Fix broken test on 2014.7 2014-09-22 12:13:10 -06:00
vs
ca5e63ed24 create minions_denied in test-env, update wheel-test to expect minions_denied 2014-09-22 19:44:24 +02:00
Arnold Bechtoldt
3e483523ff changing param back to backend in fileserver to improve useability 2014-09-22 11:16:27 -06:00
Arnold Bechtoldt
94516433e7 fix integration test in fileserver runner, refs #16008 2014-09-22 11:16:27 -06:00
Arnold Bechtoldt
b588245c1d extend fileserver runner with additional features 2014-09-22 11:16:26 -06:00
Thomas S Hatch
7355f53057 Add fileserver_backend to jinja tests local opts 2014-09-22 10:29:25 -06:00
Arnold Bechtoldt
043c29d518 changing param back to backend in fileserver to improve useability 2014-09-22 08:18:13 +02:00
Arnold Bechtoldt
6b251cbb05 fix integration test in fileserver runner, refs #16008 2014-09-21 21:19:03 +02:00
Arnold Bechtoldt
db5dde72cf extend fileserver runner with additional features 2014-09-21 20:16:41 +02:00
Thomas S Hatch
3fe53840c0 Merge pull request #15992 from rallytime/bp-15617 
Backport #15617 to 2014.7
 2014-09-19 21:41:29 -06:00
rallytime
936a6bca5a Fix mdadm tests 2014-09-19 16:35:43 -06:00
Pedro Algarvio
aed0178072 Correct --output-file-append test 2014-09-19 10:33:38 -06:00
Thomas Jackson
3815bbbfa8 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-09-19 08:11:31 -07:00
rallytime
4a740d876d Change ec2 profile name in config_test so test doesn't fail 2014-09-18 20:41:08 -06:00
rallytime
ffe00e0909 Update ec2 provider and profile config files for cloud nightly tests 2014-09-18 20:41:08 -06:00
rallytime
d861915d93 Add EC2 cloud test file 2014-09-18 20:41:08 -06:00
Thomas Jackson
4abe763591 Add tests for timeouts to client tests. In addition this makes all of the client functions have the same functionality 2014-09-18 14:38:13 -07:00
Thomas Jackson
a7e3586274 Add CLI timeout tests to standard client tests 2014-09-18 14:10:02 -07:00
Pedro Algarvio
8e3f9963cb Correct --output-file-append test 2014-09-17 19:40:58 +01:00
Erik Johnson
111a09f2ad Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	salt/minion.py
	salt/output/nested.py
 2014-09-16 18:46:48 -05:00
Erik Johnson
3f19d518fb Fix --define directive for Cent5 builds 2014-09-16 18:16:44 -05:00
Thomas S Hatch
4df1ba300c Merge pull request #15839 from jacksontj/develop 
Handle OSErrorin processmanager
 2014-09-16 15:05:07 -06:00
Thomas Jackson
29110d0a92 Cleanup, the function name changed 2014-09-16 13:22:55 -07:00
rallytime
064868b87a Fix test failures on develop 2014-09-16 12:23:06 -06:00
rallytime
85f82816c2 Revert "Put provider specific information only in provider configuration file" 
This reverts commit 1ccec204b2.
 2014-09-16 08:40:43 -06:00
rallytime
a5c658b337 Disable pylint unused import warning 2014-09-16 07:14:38 -06:00
rallytime
1ccec204b2 Put provider specific information only in provider configuration file 2014-09-16 07:08:18 -06:00
rallytime
2801dfbee4 Rename azure tests to match cloud module and add azure sdk import back in 2014-09-16 06:35:12 -06:00
rallytime
35793bd8d9 Pylint fix 2014-09-15 20:20:37 -06:00
rallytime
b30e750a8a Azure cloud tests 
Oh, and rename cloud.profiles.d/azure.sls to cloud.profiles.d/azure.conf
 2014-09-15 16:58:26 -06:00
rallytime
a30ccd2a7b Add cloud provider and profile configuration files 2014-09-15 15:57:27 -06:00
Colton Myers
8d0bf0ee95 Merge branch '2014.7' into develop 
Conflicts:
	salt/states/pip_state.py
 2014-09-15 11:49:04 -06:00
rallytime
e34157c70b Add skipIf import to fix the 2014.7 tests 2014-09-15 08:23:08 -06:00
Pedro Algarvio
a171a35c89 Disable test_issue_10404_ptys_not_released 
Disabled until we can find out why this kills the tests suite with an exit code of 134
 2014-09-14 23:54:38 +01:00
rallytime
2b3d4b8e6b Import function in syslog_ng_test so tests will run 2014-09-14 08:04:20 -06:00
Thomas S Hatch
4efc90ad92 Merge pull request #15743 from saltstack/temp-merge-forward 
Merge 2014.7 into develop
 2014-09-12 14:30:53 -06:00
Thomas S Hatch
d60804a709 lint fixes for #15695 2014-09-12 10:42:35 -06:00
Thomas S Hatch
5d27e77c92 Merge branch 'feature/postgres_schema' of https://github.com/novapost/salt into novapost-feature/postgres_schema 2014-09-12 10:39:40 -06:00
Colton Myers
e92dc99e9a Merge branch '2014.7' into temp-merge-forward 
Conflicts:
	salt/minion.py
 2014-09-12 10:37:24 -06:00
Thomas S Hatch
d6e3e01c6d Merge pull request #15392 from ihrwein/f/add-syslog-ng-modules 
F/add syslog ng modules
 2014-09-12 10:37:02 -06:00
Colton Myers
f3b5f122fb Merge pull request #15728 from rallytime/cleanup_integration 
Remove unused kwarg from _check_state_return
 2014-09-12 10:19:18 -06:00
Pedro Algarvio
080a06252a Merge pull request #15676 from rallytime/ec2_cloud_tests 
Ec2 cloud tests
 2014-09-12 08:23:51 +01:00
Erik Johnson
3ea1fe064e Add SRPM to build artifacts for automated RPM builds 2014-09-12 01:35:15 -05:00
Erik Johnson
53ce42428a Rename --dest-dir to --build-dir 
``--build-dir`` is a more accurate name. ``--dest-dir`` seems to suggest
that this is where the packages ultimately end up. While it's true that
the packages do end up within that directory, they are copied to the
artifact directory, from which they are ultimately retrieved by the
jenkins master.
 2014-09-12 01:35:08 -05:00
rallytime
6679f26736 Remove unused kwarg from _check_state_return 2014-09-11 23:32:51 -06:00
Erik Johnson
c69d47d062 Revert "Revert "Re-enable test run SLS"" 
This reverts commit fcfa1a244e and
re-enables tests in jenkins.py. They had been left commented out while I
was testing.
 2014-09-11 18:08:29 -05:00
Thomas S Hatch
6edfc3d281 Merge pull request #15558 from terminalmage/buildpackage 
Add automated RPM building to jenkins tests
 2014-09-11 16:44:27 -06:00
Erik Johnson
fcfa1a244e Revert "Re-enable test run SLS" 
This reverts commit 8bcc418aa2.
 2014-09-11 17:44:00 -05:00
Erik Johnson
8883f974a8 Add command-line options for package build options 
Also add these to pillar data so they make it to the buildpackage SLS
 2014-09-11 17:05:09 -05:00
Erik Johnson
8bcc418aa2 Re-enable test run SLS 
Now that the buildpackage stuff is ready, this no longer needs to be
commented out.
 2014-09-11 13:35:40 -05:00
Erik Johnson
cb31726500 Download packages only when buildpackage.py was run 2014-09-11 13:19:44 -05:00
Erik Johnson
e22c000d5c Create the build log in the artifact dir 
This allows the jenkins master to receive the log file even if the build
script aborted. Before I was just copying the log file to the artifact
dir at the end of the script, which meant that jenkins only gets the log
when the script succeeds.
 2014-09-11 13:08:40 -05:00
Erik Johnson
a146a80034 Fix tarfile name 2014-09-11 12:56:45 -05:00
Erik Johnson
2256dc786a Fix path to cached packages 2014-09-11 12:42:40 -05:00
Pedro Algarvio
da1fb62a67 Fix typo in comment 2014-09-11 18:18:39 +01:00
Erik Johnson
12ca973f10 Fix path for cp.push 2014-09-11 12:07:00 -05:00
Erik Johnson
8c89d7e193 Fix block comment 
I wasn't letting the prep sls run when testing package auto-builds
 2014-09-11 11:33:49 -05:00
Rodolphe Quiédeville
b4dcc992c5 - salt/modules/postgres.py: add functions to manipulate schemas 
- salt/states/postgres_schema.py: new states for schemas
- tests/unit/modules/postgres_test.py: add tests on new functions
- tests/unit/states/postgres_test.py: add tests on new functions
 2014-09-11 12:17:18 +02:00
Erik Johnson
07a58c4bae Revert "Uncomment test run code" 
This reverts commit e45b816341.
 2014-09-10 17:20:08 -05:00
rallytime
a28e0d88a3 Change ec2 profile name in config_test so test doesn't fail 2014-09-10 12:23:34 -06:00
Thomas S Hatch
245c06100d Merge pull request #15568 from jacksontj/process_manage 
Process manager
 2014-09-09 11:30:30 -06:00
Thomas S Hatch
0004ff8898 Merge branch '2014.7' into develop 2014-09-09 11:20:29 -06:00
rallytime
f7a00ce643 Fix mdadm tests 2014-09-09 07:07:23 -06:00
rallytime
40253cb47b Update ec2 provider and profile config files for cloud nightly tests 2014-09-08 17:06:45 -06:00
rallytime
99cc951377 Add EC2 cloud test file 2014-09-08 16:18:48 -06:00
Thomas S Hatch
0a094e2c43 Merge pull request #15104 from srkunze/feature/safe_env 
Made safe environment copy
 2014-09-08 14:48:58 -06:00
rallytime
690e85a089 Change expected return for deleting digital ocean instance 2014-09-08 14:13:26 -06:00
Erik Johnson
e45b816341 Uncomment test run code 
I was unaware that the tests run using a hard-coded jenkins.py, so
commenting it out as I did has no effect.
 2014-09-08 14:02:27 -05:00
Erik Johnson
9452709cb3 Lint fixes 2014-09-08 14:02:18 -05:00
Erik Johnson
ec842a754c Add RPM building to jenkins.py 
This is a work-in-progress commit. The running of the actual test suite
has been commented out to facilitate quicker testing of the RPM builds,
I will need to uncomment this before this is merged.
 2014-09-08 12:23:44 -05:00
Erik Johnson
60e606d250 Fix relative paths, move build log to artifact dir 2014-09-08 12:07:29 -05:00
Thomas Jackson
4a83d8a9c3 Pylint cleanup 2014-09-06 15:45:15 -07:00
Thomas S Hatch
467fd955ed Merge pull request #15564 from s0undt3ch/hotfix/git-describe-first-parent 
Use the first parent on git describe when available.
 2014-09-06 16:31:46 -06:00
Thomas Jackson
d029685e96 Change main master daemon to use ProcessManager 
Add tests for processmanager
 2014-09-06 14:31:20 -07:00
Pedro Algarvio
0a1857b8f1 Update test case to also use --first-parent 2014-09-06 02:32:18 +01:00
rallytime
1727d04701 Generate random cloud provider names on digital ocean 2014-09-05 15:57:00 -06:00
Erik Johnson
40ce199736 make logger global for buildpackage.py 2014-09-05 16:30:26 -05:00
Erik Johnson
9ea317d510 Add spec file for git builds 2014-09-05 15:11:02 -05:00
rallytime
6de2a37ec8 Generate random cloud instance name on rackspace tests 2014-09-05 14:09:42 -06:00
Erik Johnson
aa9a0555e0 Add buildpackage.py 2014-09-05 15:04:46 -05:00
Dave Rawks
873ca1e0b1 Updated test to account for additional flag 2014-09-05 10:08:17 -07:00
Thomas S Hatch
e34e81f41b Merge branch '2014.7' into develop 
Conflicts:
	salt/minion.py
 2014-09-05 11:03:12 -06:00
rallytime
df504928b6 Update linode tests to use a randomly generated instance name 2014-09-05 09:23:40 -06:00
Sven R. Kunze
d294e95cf5 fixed test_os_environment_remains_intact 2014-09-05 12:20:08 +02:00
Thomas S Hatch
70950a1543 Merge pull request #15510 from lyft/boto_elb_resolve_error_on_deregister_instances_call 
deregister_instances and register_instances methods return True/False/None
 2014-09-04 15:32:45 -06:00
Thomas S Hatch
921fd6362c Merge pull request #15512 from ajacoutot/obsd-tests 
tests: recognize OpenBSD
 2014-09-04 15:27:42 -06:00
Colton Myers
57e187d46f Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/mount.py
 2014-09-04 13:45:03 -06:00
Thomas S Hatch
a2e8d72f21 Merge pull request #15462 from garethgreenaway/returner_experiments 
Updates to returners, consolidated code.
 2014-09-04 11:03:23 -06:00
Antoine Jacoutot
1ef276575f tests: recognize OpenBSD 2014-09-04 10:23:59 +02:00
Colin Johnson
754c01448e provide True, False and None returns on deregister_instances and register_instances methods 2014-09-04 05:53:52 +00:00
rallytime
155b548eae Remove unnecessary import requirements to cloud integration tests 2014-09-03 20:12:44 -06:00
Colton Myers
f8c6fc00b6 Merge branch '2014.7' into develop 2014-09-03 16:24:12 -06:00