valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2016.3' into '2016.11'

Browse Source 
No conflicts.
This commit is contained in:
rallytime 2016-12-12 10:08:27 -07:00
commit e31f97cf71
3 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
doc/topics/development/tests/index.rst
View File

@ -88,6 +88,28 @@ the lines below, depending on the relevant Python version:
pip install -r requirements/dev_python26.txt
pip install -r requirements/dev_python27.txt
To be able to run integration tests which utilizes ZeroMQ transport, you also
need to install additional requirements for it. Make sure you have installed
the C compiler and development libraries and header files needed for your
Python version.
This is an example for RedHat-based operating systems:
.. code-block:: bash
yum install gcc python-devel
pip install -r requirements/zeromq.txt
On Debian, Ubuntu or their derivatives run the following commands:
.. code-block:: bash
apt-get install build-essential python-dev
pip install -r requirements/zeromq.txt
This will install the latest ``pycrypto`` and ``pyzmq`` (with bundled
``libzmq``) Python modules required for running integration tests suite.
.. note::
In Salt 0.17, testing libraries were migrated into their own repo. To install them:

22
doc/topics/tutorials/writing_tests.rst
View File

@ -42,6 +42,28 @@ depending on your relevant version of Python:
pip install -r requirements/dev_python26.txt
pip install -r requirements/dev_python27.txt
To be able to run integration tests which utilizes ZeroMQ transport, you also
need to install additional requirements for it. Make sure you have installed
the C compiler and development libraries and header files needed for your
Python version.
This is an example for RedHat-based operating systems:
.. code-block:: bash
yum install gcc python-devel
pip install -r requirements/zeromq.txt
On Debian, Ubuntu or their derivatives run the following commands:
.. code-block:: bash
apt-get install build-essential python-dev
pip install -r requirements/zeromq.txt
This will install the latest ``pycrypto`` and ``pyzmq`` (with bundled
``libzmq``) Python modules required for running integration tests suite.
Test Directory Structure
========================

16
salt/runners/git_pillar.py
View File

@ -34,7 +34,21 @@ def update(branch=None, repo=None):
values will be ``True`` only if new commits were fetched, and ``False``
if there were errors or no new commits were fetched.
Update one or all configured git_pillar remotes.
Fetch one or all configured git_pillar remotes.
.. note::
This will *not* fast-forward the git_pillar cachedir on the master. All
it does is perform a ``git fetch``. If this runner is executed with
``-l debug``, you may see a log message that says that the repo is
up-to-date. Keep in mind that Salt automatically fetches git_pillar
repos roughly every 60 seconds (or whatever
:conf_master:`loop_interval` is set to). So, it is possible that the
repo was fetched automatically in the time between when changes were
pushed to the repo, and when this runner was executed. When in doubt,
simply refresh pillar data using :py:func:`saltutil.refresh_pillar
<salt.modules.saltutil.refresh_pillar>` and then use
:py:func:`pillar.item <salt.modules.pillar.item>` to check if the
pillar data has changed as expected.
CLI Example: