Commit graph

5357 commits

Author SHA1 Message Date
Pedro Algarvio
2b14375b30 No empty docstrings 2015-07-12 19:26:33 +01:00
Pedro Algarvio
6294c67b12 Nicer handling of user keyboard interruption 2015-07-12 12:37:56 +01:00
Pedro Algarvio
0add87e7b9 Display the failed import reason 2015-07-12 12:30:24 +01:00
Pedro Algarvio
e6df8cbe24 Add allowed choices to output format.
Since we're using the print function, we can specify the file handler to
user and in this case we choose `sys.stderr`
2015-07-12 12:27:26 +01:00
Pedro Algarvio
ef75ea068c Lint fixes to tests/modparser.py 2015-07-12 12:22:28 +01:00
Thomas S Hatch
50a55eca58 Add output options to modparser 2015-07-11 15:36:58 -06:00
Thomas S Hatch
3f282e21f1 Add modparser script 2015-07-11 15:25:36 -06:00
Pedro Algarvio
7a796440c0 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-10 11:16:48 +01:00
Thomas S Hatch
a0e585f8f8 Merge pull request #25267 from jfindlay/disk_mod
Disk module improvements
2015-07-09 19:30:45 -06:00
Pedro Algarvio
1388010187 Remove hardcoded maxDiff 2015-07-09 20:59:59 +01:00
Pedro Algarvio
3adb731abc Fixed ordering issue 2015-07-09 20:57:23 +01:00
Pedro Algarvio
cf071eaffa Add test which asserts proper field ordering 2015-07-09 17:32:50 +01:00
Colton Myers
a40574850f Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-07-08 16:26:25 -06:00
Colton Myers
3a7289a0cb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/ref/states/all/salt.states.aptpkg.rst
    doc/ref/states/all/salt.states.etcd_mod.rst
    doc/topics/releases/releasecandidate.rst
    salt/client/mixins.py
    salt/modules/win_pkg.py
    tests/unit/modules/boto_vpc_test.py
2015-07-08 16:24:58 -06:00
Justin Findlay
beb9715d0e update blockdev tests for deprecation 2015-07-08 14:50:52 -06:00
rallytime
138c4f1e72 Remove parted deprecations and fix failing tests 2015-07-08 09:03:55 -06:00
Pedro Algarvio
39c1e32f47 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-08 11:47:25 +01:00
Pedro Algarvio
f36123c4df ArrayConfig must have items passed. Added DictConfig with tests. 2015-07-07 15:10:16 +01:00
rallytime
f959e165a1 Clean up imports 2015-07-07 06:28:10 -06:00
rallytime
fbc9c0d6bf Fix Pylint 2015-07-07 05:43:00 -06:00
Pedro Algarvio
884212532a Add test for subclassed Configuration classes 2015-07-07 10:45:29 +01:00
Colton Myers
9fde9df55b Remove tests (glance rewrite requires test rewrite) 2015-07-06 14:13:15 -06:00
rallytime
fe2561f415 Update moto version check in boto_vpc_test and update min version
Fixes #24272
2015-07-06 14:03:59 -06:00
Erik Johnson
bd46c875ea Merge pull request #25162 from ticosax/dockerng-fix-pull-force
[dockerng] Do not call inspect_image if we know the image is not downloaded
2015-07-06 10:18:16 -05:00
Mike Place
a67156e34f Fix tests for #25115 2015-07-06 08:54:45 -06:00
Nicolas Delaby
48f20b9739 Do not call inspect_image if we know the image is not downloaded 2015-07-06 14:01:25 +02:00
Pedro Algarvio
0cbf22d884 Merge pull request #25145 from s0undt3ch/features/raas-17-salt-cloud-2015.8
Implement `oneOf`, `anyOf`, `allOf` and `not` with unit tests
2015-07-03 17:56:44 +01:00
Pedro Algarvio
44738b2123 Lint fixes 2015-07-03 17:56:31 +01:00
Pedro Algarvio
f84c3e4fbd Add support for enumNames 2015-07-03 16:40:48 +01:00
Pedro Algarvio
0d9173c57e Remove repeated test 2015-07-03 16:28:57 +01:00
Pedro Algarvio
625e0b6c06 Implement oneOf, anyOf, allOf and not with unit tests 2015-07-03 16:24:46 +01:00
Thomas S Hatch
3922992e6b Merge pull request #25131 from s0undt3ch/features/raas-17-salt-cloud-2015.8
Array support in salt.utils.config
2015-07-02 13:40:34 -06:00
Pedro Algarvio
237023dde0 Support Configuration as an array item 2015-07-02 17:38:06 +01:00
Pedro Algarvio
51e76c3a38 Properly handle salt.utils.config.Null 2015-07-02 17:38:06 +01:00
Pedro Algarvio
e0f4706ef6 Add array support to salt.utils.config (with unit tests) 2015-07-02 17:38:06 +01:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
2015-07-02 09:46:36 -06:00
Pedro Algarvio
f65501fff4 Merge pull request #25106 from s0undt3ch/features/raas-17-salt-cloud-ng
Minor refactor + Unit tests for salt.utils.config + minor changes to 2 cloud drivers
2015-07-02 11:58:34 +01:00
Pedro Algarvio
545d7e0a34 PyLint fixes 2015-07-02 10:10:25 +01:00
Pedro Algarvio
07167422ba Also test pattern 2015-07-02 10:08:08 +01:00
Justin Findlay
576f1b8493 Merge pull request #25008 from basepi/merge-forward-develop
Merge forward from 2015.5 to develop
2015-07-01 19:04:59 -06:00
Pedro Algarvio
4d4e94b59c Unit tests for salt.utils.config 2015-07-01 18:18:31 +01:00
Justin Findlay
071ee44d41 Revert "Revert "adding states/postgres_database unit test case."" 2015-07-01 09:47:08 -06:00
Justin Findlay
bf8c7e7a9d Merge pull request #24362 from jayeshka/postgres_user-states-unit-test
adding states/postgres_user unit test case.
2015-07-01 15:45:31 -06:00
Justin Findlay
4195cea512 Merge pull request #24361 from jayeshka/postgres_schema-states-unit-test
adding states/postgres_schema unit test case.
2015-07-01 15:44:56 -06:00
Justin Findlay
ada8fe57d4 Merge pull request #24331 from jayeshka/postgres_extension-states-unit-test
adding states/postgres_extension unit test case.
2015-07-01 15:43:58 -06:00
Justin Anderson
21709aa483 Merge pull request #25096 from jfindlay/postgres_group_test
Postgres group test
2015-07-01 12:48:25 -06:00
David Boucha
0a846400c6 Merge pull request #25085 from jfindlay/fix_file
accept all sources in the file state
2015-07-01 12:23:45 -06:00
Justin Findlay
a98394210e Merge pull request #25095 from jfindlay/win_groupadd_test
Win groupadd unit tests
2015-07-01 12:18:53 -06:00
Justin Findlay
3c379dc115 declobber postgres state unit test mocking 2015-07-01 12:01:50 -06:00
Justin Findlay
564dffd14a depend on win libs rather than mocking them 2015-07-01 11:14:19 -06:00