Commit Graph

35 Commits

Author SHA1 Message Date
Pablo Suárez Hernández
a0bbb0f648 Integration tests fixes for 2016.3 (#36263)
* Fix PillarModuleTest::test_pillar_items: 'info' does not exist in pillar

* Fixing integration tests if azure is not present

* Fixing integration tests failures if 'git' command is missing

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
2016-09-13 12:40:56 -06:00
rallytime
0fd5e9d157 Merge branch '2015.5' into '2015.8'
Conflits:
  - salt/minion.py
  - tests/integration/states/file.py
2016-05-06 12:04:06 -06:00
Megan Wilhite
d48b2b8b52 test pillar.items output (#33060) 2016-05-05 06:51:27 -07:00
Colton Myers
3286a5250f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/pillar.rst
    pkg/windows/installer/Salt-Minion-Setup.nsi
    salt/modules/file.py
    salt/modules/schedule.py
    salt/pillar/git_pillar.py
    salt/states/boto_route53.py
    salt/states/pkg.py
    tests/integration/modules/pillar.py
2015-10-30 16:05:26 -06:00
Erik Johnson
0d6a4ac115 Remove non-functional test
This test was written using an incorrect assumption that the
pillar_roots key created during git_pillar execution lives any longer
than the run that compiles the git_pillar data for a given git_pillar.
2015-10-24 17:39:16 -05:00
Erik Johnson
86f00e71bf Remove non-functional test
This test was written using an incorrect assumption that the
pillar_roots key created during git_pillar execution lives any longer
than the run that compiles the git_pillar data for a given git_pillar.
2015-10-24 17:36:33 -05:00
Colton Myers
35425b14ad Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/man/salt-api.1
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt-key.1
    doc/man/salt-master.1
    doc/man/salt-minion.1
    doc/man/salt-run.1
    doc/man/salt-ssh.1
    doc/man/salt-syndic.1
    doc/man/salt-unity.1
    doc/man/salt.1
    doc/man/salt.7
    salt/modules/pip.py
    salt/states/user.py
2015-10-07 12:06:12 -06:00
Oleg Gashev
2a88028595 Added skip test_ext_pillar_env_mapping if git module does not exist.
If module named git does not exist, test test_ext_pillar_env_mapping
fail:

======================================================================
ERROR: test_ext_pillar_env_mapping
(integration.modules.pillar.PillarModuleTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/opt/git/salt/tests/integration/modules/pillar.py", line 120, in
test_ext_pillar_env_mapping
    import git
ImportError: No module named git

Added skip test_ext_pillar_env_mapping test.
2015-10-05 14:47:25 -06:00
Erik Johnson
9a87f052d5 Update class name for old git pillar class 2015-08-20 10:39:36 -05:00
Erik Johnson
73192390a2 Test fixes 2015-07-22 00:48:43 -05:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Colton Myers
70489c62a7 Merge branch '2014.7' into merge-forward-2015.2
Conflicts:
	salt/modules/cron.py
	salt/modules/rabbitmq.py
	salt/modules/smf.py
	salt/modules/upstart.py
	salt/modules/useradd.py
	salt/modules/zpool.py
	salt/pillar/git_pillar.py
2015-01-07 14:49:58 -07:00
Seth House
e96654744f Added test for git_pillar branch to env mappings 2015-01-06 16:51:58 -07:00
Pedro Algarvio
a985f0ac4e Disable some Pylint errors 2014-12-01 03:23:52 +00:00
Pedro Algarvio
14cc8931ed Disable some Pylint errors 2014-11-28 15:30:05 +00:00
Jonathan Ballet
97959959ca Add future's absolute import to fix importation of git in tests
Tests in pillar.py are importing the "git" module, which is supposed to
be "GitPython", bt since Python 2.x doesn't use absolute import by
default, it imports the "git" submodule, which defines the tests for the
Git module of Salt, instead.
2014-11-18 22:46:35 +01:00
rallytime
7f170c126f Remove 'RC1' from GIT_VERSION comparison 2014-08-14 11:06:18 -06:00
rallytime
fe5b8d22ec Fix gitpillar skipIfs 2014-08-14 10:34:38 -06:00
rallytime
496cfe25b3 Add skipIfs to ext_pillar tests if GitPillar 0.3.2rc1 or > isn't installed 2014-08-13 14:14:53 -06:00
Aditya Kulkarni
edfabad5e2 Skip tests if no internet connection 2014-07-08 17:16:47 -06:00
Aditya Kulkarni
a7b52855d3 Make sure multiple git pillar sources work 2014-07-08 10:58:31 -06:00
Thomas S Hatch
81790838fa tmp stub out test until we can find a better home for it 2014-02-17 14:31:41 -07:00
Vye Wilson
e2b1381185 Adds support for updating cached git repo url.
Fixes #10408
2014-02-12 18:58:42 -08:00
Pedro Algarvio
d02a2bc224 Include the python encoding file header on tests. 2013-11-27 11:19:24 +00:00
David Anderson
ec4475cf30 Fix issue 5951 - correct __opts__['file_roots'] in ext_pillars 2013-10-11 11:53:00 -06:00
David Anderson
25b0e3f89e Restore the pillar[master][file_roots] when returning the pillar 2013-10-10 15:12:00 -06:00
Pedro Algarvio
863092af60 Updated integration.modules.pillar test suite to use salttesting.helpers.ensure_in_syspath() 2013-06-28 00:13:00 +01:00
Pedro Algarvio
be54a503d9 Adapted code fix sys.path in case called from __main__. Adapted to salt-testing. 2013-06-28 00:12:56 +01:00
Thomas S Hatch
4ec6722103 revert cmd_yaml change that broke basic functionality 2013-02-06 13:03:34 -07:00
Thomas S Hatch
47e08fc4fa Remove failing test, I am not sure how it ever passed... 2013-02-06 12:48:33 -07:00
Roman Imankulov
bb0ed1a3a7 Tests cleanup
Defined "integration.run_tests()" function which can be used to execute
a particular integration test case. Existing bolerplate code in modules
and states tests is replaced with following lines:

    if __name__ == '__main__':
        from integration import run_tests
        run_tests(TestCaseName)

Typical usecase could look like this:

    python integration/modules/pip.py --no-clean -vv
2012-07-20 12:25:08 +06:00
Baiju Muthukadan
cb5e3ea089 Add testrunner boilerplate code to run tests 2012-05-05 19:39:23 +05:30
Thomas S Hatch
f95c8a74e4 Add test for ext_pillar 2012-04-08 21:34:55 -06:00
Thomas S Hatch
a00d3cb501 Add tests to cover pillar passing minion grains data in 2012-04-01 21:59:23 -06:00
Thomas S Hatch
47768c7149 Add pillar module verification 2012-03-29 16:35:49 -06:00