saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #30895 from bdrung/2015.8

Browse source 
Fix various typos
This commit is contained in:
Mike Place 2016-02-04 13:55:10 -07:00
commit 4372851ad9
36 changed files with 59 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/cloud
View file

@ -44,7 +44,7 @@
#log_level_logfile: info
# The date and time format used in log messages. Allowed date/time formating
# The date and time format used in log messages. Allowed date/time formatting
# can be seen here:
#
# http://docs.python.org/library/time.html#time.strftime

2
conf/master
View file

@ -771,7 +771,7 @@
# If using 'log_granular_levels' this must be set to the highest desired level.
#log_level_logfile: warning
# The date and time format used in log messages. Allowed date/time formating
# The date and time format used in log messages. Allowed date/time formatting
# can be seen here: http://docs.python.org/library/time.html#time.strftime
#log_datefmt: '%H:%M:%S'
#log_datefmt_logfile: '%Y-%m-%d %H:%M:%S'

2
conf/minion
View file

@ -531,7 +531,7 @@
# Default: 'warning'
#log_level_logfile:
# The date and time format used in log messages. Allowed date/time formating
# The date and time format used in log messages. Allowed date/time formatting
# can be seen here: http://docs.python.org/library/time.html#time.strftime
#log_datefmt: '%H:%M:%S'
#log_datefmt_logfile: '%Y-%m-%d %H:%M:%S'

2
conf/proxy
View file

@ -510,7 +510,7 @@
# Default: 'warning'
#log_level_logfile:
# The date and time format used in log messages. Allowed date/time formating
# The date and time format used in log messages. Allowed date/time formatting
# can be seen here: http://docs.python.org/library/time.html#time.strftime
#log_datefmt: '%H:%M:%S'
#log_datefmt_logfile: '%Y-%m-%d %H:%M:%S'

2
doc/topics/development/reporting_bugs.rst
View file

@ -19,7 +19,7 @@ In an issue report, please include the following information:
* Any steps taken to attempt to remediate the problem.
* Any configuration options set in a configuration file that may be relevent.
* Any configuration options set in a configuration file that may be relevant.
* A reproduceable test case. This may be as simple as an SLS file that
illustrates a problem or it may be a link to a repository that contains a

2
doc/topics/releases/2014.7.0.rst
View file

@ -466,7 +466,7 @@ Configurable Trunk/Branches/Tags Paths
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Prior to this release, the paths where trunk, branches, and tags were located
could only be in directores named "trunk", "branches", and "tags" directly
could only be in directories named "trunk", "branches", and "tags" directly
under the root of the repository. Three new config parameters
(:conf_master:`svnfs_trunk`, :conf_master:`svnfs_branches`, and
:conf_master:`svnfs_tags`) allow SVN repositories which are laid out

4
doc/topics/releases/2014.7.3.rst
View file

@ -24,13 +24,13 @@ Changes:
- Various fixes to the Windows installation scripts
- Fix issue where the syndic would not correctly propogate loads to the master
- Fix issue where the syndic would not correctly propagate loads to the master
job cache.
- Improve error handling on invalid /etc/network/interfaces file in salt
networking modules
- Fix bug where a reponse status was not checked for in fileclient.get_url
- Fix bug where a response status was not checked for in fileclient.get_url
- Enable eauth when running salt in batch mode

4
doc/topics/releases/2014.7.4.rst
View file

@ -33,13 +33,13 @@ Changes:
- Various fixes to the Windows installation scripts
- Fix issue where the syndic would not correctly propogate loads to the master
- Fix issue where the syndic would not correctly propagate loads to the master
job cache.
- Improve error handling on invalid /etc/network/interfaces file in salt
networking modules
- Fix bug where a reponse status was not checked for in fileclient.get_url
- Fix bug where a response status was not checked for in fileclient.get_url
- Enable eauth when running salt in batch mode

2
doc/topics/releases/2015.5.1.rst
View file

@ -125,7 +125,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt
* ebff1ff Merge pull request `#23956`_ from rallytime/`bp-23906`_
* 9d87fd3 add proper marker for format argument
* 197688e Added exception handler to trap the RuntimeError raised when Depends.enforce_dependency() class method fires unsuccessfully. There appears to be no synchronization within the Depends decorator class wrt the class global dependency_dict which results in incomplete population of any loader instantiation occuring at the time of one of these exceptions.
* 197688e Added exception handler to trap the RuntimeError raised when Depends.enforce_dependency() class method fires unsuccessfully. There appears to be no synchronization within the Depends decorator class wrt the class global dependency_dict which results in incomplete population of any loader instantiation occurring at the time of one of these exceptions.
- **PR** `#23955`_: (*rallytime*) Backport `#19305`_ to 2015.5
@ *2015-05-20T03:03:55Z*

6
doc/topics/releases/2015.5.2.rst
View file

@ -84,7 +84,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt
@ *2015-06-01T17:45:36Z*
* 02bfb25 Merge pull request `#24281`_ from steverweber/ipmi_docfix
* dd36f2c yaml formating
* dd36f2c yaml formatting
* f6deef3 include api_kg kwarg in ipmi state
@ -874,7 +874,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt
**PR** `#24015`_: (*YanChii*) minor improvement of solarisips docs & fix typos
| refs: `#24039`_
* d909781 Merge pull request `#24039`_ from rallytime/`bp-24015`_
* 6bfaa94 minor improovement of solarisips docs & fix typos
* 6bfaa94 minor improvement of solarisips docs & fix typos
**PR** `#24038`_: (*rallytime*) Backport `#19599`_ to 2015.5
@ *2015-05-21T23:43:10Z*
@ -913,7 +913,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt
* 1dc67e5 lxc: versionadded
* fcad7cb lxc: states improvments
* fcad7cb lxc: states improvements
* 644bd72 lxc: more consistence for profiles

4
doc/topics/releases/2015.5.4.rst
View file

@ -1112,7 +1112,7 @@ Changes:
- **PR** `#25326`_: (*rallytime*) Back-port `#20972`_ to 2015.5
@ *2015-07-10T18:49:44Z*
- **ISSUE** `#19288`_: (*oba11*) AssociatePublicIpAddress doesnt work with salt-cloud 2014.7.0
- **ISSUE** `#19288`_: (*oba11*) AssociatePublicIpAddress doesn't work with salt-cloud 2014.7.0
| refs: `#20972`_ `#25326`_
- **PR** `#20972`_: (*JohannesEbke*) Fix interface cleanup when using AssociatePublicIpAddress in `#19288`_
| refs: `#25326`_
@ -1304,7 +1304,7 @@ Changes:
- **ISSUE** `#24979`_: (*mavenAtHouzz*) [Discussion] Support for more than 1 netapi.rest_tornado server process
| refs: `#25149`_
- **PR** `#25120`_: (*d--j*) add missing continue for exeption case
- **PR** `#25120`_: (*d--j*) add missing continue for exception case
@ *2015-07-02T19:38:45Z*
- **PR** `#25117`_: (*basepi*) Fix fileclient.is_cached

4
doc/topics/releases/2015.5.5.rst
View file

@ -1110,7 +1110,7 @@ Changes:
- **PR** `#25326`_: (*rallytime*) Back-port `#20972`_ to 2015.5
@ *2015-07-10T18:49:44Z*
- **ISSUE** `#19288`_: (*oba11*) AssociatePublicIpAddress doesnt work with salt-cloud 2014.7.0
- **ISSUE** `#19288`_: (*oba11*) AssociatePublicIpAddress doesn't work with salt-cloud 2014.7.0
| refs: `#20972`_ `#25326`_
- **PR** `#20972`_: (*JohannesEbke*) Fix interface cleanup when using AssociatePublicIpAddress in `#19288`_
| refs: `#25326`_
@ -1302,7 +1302,7 @@ Changes:
- **ISSUE** `#24979`_: (*mavenAtHouzz*) [Discussion] Support for more than 1 netapi.rest_tornado server process
| refs: `#25149`_
- **PR** `#25120`_: (*d--j*) add missing continue for exeption case
- **PR** `#25120`_: (*d--j*) add missing continue for exception case
@ *2015-07-02T19:38:45Z*
- **PR** `#25117`_: (*basepi*) Fix fileclient.is_cached

2
doc/topics/releases/2015.8.1.rst
View file

@ -256,7 +256,7 @@ Changes:
- **PR** `#27050`_: (*twangboy*) Turned multiprocessing on
- **PR** `#27086`_: (*techhat*) Document develoment of SPM loader modules
- **PR** `#27086`_: (*techhat*) Document development of SPM loader modules
- **PR** `#26941`_: (*msteed*) Make elasticsearch work as master job cache

4
doc/topics/releases/2015.8.4.rst
View file

@ -160,7 +160,7 @@ Changes:
- **PR** `#30349`_: (*rallytime*) Back-port `#30347`_ to 2015.8
- **PR** `#30354`_: (*anlutro*) Make sure all ignore_missing SLSes are catched
- **PR** `#30354`_: (*anlutro*) Make sure all ignore_missing SLSes are caught
- **PR** `#30356`_: (*nmadhok*) Adding code author
@ -322,7 +322,7 @@ Changes:
- **PR** `#30033`_: (*rallytime*) Back-port `#29876`_ to 2015.8
- **PR** `#30029`_: (*terminalmage*) git.latest: Fix handling of nonexistant branches
- **PR** `#30029`_: (*terminalmage*) git.latest: Fix handling of nonexistent branches
- **PR** `#30016`_: (*anlutro*) Properly normalize locales in locale.gen_locale

2
doc/topics/releases/includes/git-2015.8.0.rst
View file

@ -150,7 +150,7 @@ Changes to Functions in Git Execution Module
convenience and to match the usage of other functions with ``force``
arguments.
- The ``refspecs`` argument has been added to allow for one or more refspecs to
be provided which overide the one(s) specified by the
be provided which override the one(s) specified by the
**remote.remote_name.fetch** git configuration option.
:py:func:`git.ls_remote <salt.modules.git.ls_remote>`

2
doc/topics/tutorials/http.rst
View file

@ -315,7 +315,7 @@ debugging purposes, SSL verification can be turned off.
CA Bundles
~~~~~~~~~~
The ``requests`` library has its own method of detecting which CA (certficate
The ``requests`` library has its own method of detecting which CA (certificate
authority) bundle file to use. Usually this is implemented by the packager for
the specific operating system distribution that you are using. However,
``urllib2`` requires a little more work under the hood. By default, Salt will

2
doc/topics/tutorials/intro_scale.rst
View file

@ -35,7 +35,7 @@ we must configure the minions to back-off appropriately when the Master is
under heavy load.
The fourth is caused by masters with little hardware resources in combination
with a possible bug in ZeroMQ. At least thats what it looks like till today
with a possible bug in ZeroMQ. At least that's what it looks like till today
(`Issue 118651 <https://github.com/saltstack/salt/issues/11865>`_,
`Issue 5948 <https://github.com/saltstack/salt/issues/5948>`_,
`Mail thread <https://groups.google.com/forum/#!searchin/salt-users/lots$20of$20minions/salt-users/WxothArv2Do/t12MigMQDFAJ>`_)

2
doc/topics/tutorials/lxc.rst
View file

@ -219,7 +219,7 @@ container-by-container basis, for instance using the ``nic_opts`` argument to
.. warning::
The ``ipv4``, ``ipv6``, ``gateway``, and ``link`` (bridge) settings in
network profiles / nic_opts will only work if the container doesnt redefine
network profiles / nic_opts will only work if the container doesn't redefine
the network configuration (for example in
``/etc/sysconfig/network-scripts/ifcfg-<interface_name>`` on RHEL/CentOS,
or ``/etc/network/interfaces`` on Debian/Ubuntu/etc.). Use these with

4
pkg/suse/salt.changes
View file

@ -111,11 +111,11 @@ Mon Mar 30 21:41:22 UTC 2015 - aboe76@gmail.com
+ Major performance improvements to Saltnado
+ Allow KVM module to operate under KVM itself or VMWare Fusion
+ Various fixes to the Windows installation scripts
+ Fix issue where the syndic would not correctly propogate loads to the master
+ Fix issue where the syndic would not correctly propagate loads to the master
job cache.
+ Improve error handling on invalid /etc/network/interfaces file in salt
networking modules
+ Fix bug where a reponse status was not checked for in fileclient.get_url
+ Fix bug where a response status was not checked for in fileclient.get_url
+ Enable eauth when running salt in batch mode
+ Increase timeout in Boto Route53 module
+ Fix bugs with Salt's 'tar' module option parsing

2
pkg/windows/buildenv/conf/minion
View file

@ -314,7 +314,7 @@ multiprocessing: True
# Default: 'warning'
#log_level_logfile:
#
# The date and time format used in log messages. Allowed date/time formating
# The date and time format used in log messages. Allowed date/time formatting
# can be seen on http://docs.python.org/library/time.html#time.strftime
#log_datefmt: '%H:%M:%S'
#log_datefmt_logfile: '%Y-%m-%d %H:%M:%S'

2
salt/config.py
View file

@ -736,7 +736,7 @@ VALID_OPTS = {
# primarily as a mitigation technique against minion disconnects.
'ping_interval': int,
# Instructs the salt CLI to print a summary of a minion reponses before returning
# Instructs the salt CLI to print a summary of a minion responses before returning
'cli_summary': bool,
# The maximum number of minion connections allowed by the master. Can have performance

2
salt/modules/aptpkg.py
View file

@ -1648,7 +1648,7 @@ def mod_repo(repo, saltenv='base', **kwargs):
if ``True``, will attempt to de-dup and consolidate sources
.. note:: Due to the way keys are stored for APT, there is a known issue
where the key wont be updated unless another change is made
where the key won't be updated unless another change is made
at the same time. Keys should be properly added on initial
configuration.

2
salt/modules/dnsutil.py
View file

@ -355,7 +355,7 @@ def serial(zone='', update=False):
'''
Return, store and update a dns serial for your zone files.
zone: a keywork for a specific zone
zone: a keyword for a specific zone
update: store an updated version of the serial in a grain

2
salt/modules/jboss7.py
View file

@ -6,7 +6,7 @@ Module for managing JBoss AS 7 through the CLI interface.
In order to run each function, jboss_config dictionary with the following properties must be passed:
* cli_path: the path to jboss-cli script, for example: '/opt/jboss/jboss-7.0/bin/jboss-cli.sh'
* controller: the ip addres and port of controller, for example: 10.11.12.13:9999
* controller: the IP address and port of controller, for example: 10.11.12.13:9999
* cli_user: username to connect to jboss administration console if necessary
* cli_password: password to connect to jboss administration console if necessary

2
salt/modules/jboss7_cli.py
View file

@ -20,7 +20,7 @@ returns it as a dictionary so that an execution of an operation can then be veri
In order to run each function, jboss_config dictionary with the following properties must be passed:
* cli_path: the path to jboss-cli script, for example: '/opt/jboss/jboss-7.0/bin/jboss-cli.sh'
* controller: the ip addres and port of controller, for example: 10.11.12.13:9999
* controller: the IP address and port of controller, for example: 10.11.12.13:9999
* cli_user: username to connect to jboss administration console if necessary
* cli_password: password to connect to jboss administration console if necessary

12
salt/modules/lxc.py
View file

@ -667,7 +667,7 @@ def get_network_profile(name=None, **kwargs):
.. warning::
The ``ipv4``, ``ipv6``, ``gateway``, and ``link`` (bridge) settings in
network profiles will only work if the container doesnt redefine the
network profiles will only work if the container doesn't redefine the
network configuration (for example in
``/etc/sysconfig/network-scripts/ifcfg-<interface_name>`` on
RHEL/CentOS, or ``/etc/network/interfaces`` on Debian/Ubuntu/etc.)
@ -830,7 +830,7 @@ def _network_conf(conf_tuples=None, **kwargs):
ret.append({'lxc.network.ipv4.gateway': gateway})
# only one network gateway ;)
gateway_set = True
# normally, this wont happen
# normally, this won't happen
# set the gateway if specified even if we did
# not managed the network underlying
if gateway is not None and not gateway_set:
@ -1933,7 +1933,7 @@ def create(name,
if backing in ('dir', 'overlayfs', 'btrfs', 'zfs'):
fstype = None
size = None
# some backends wont support some parameters
# some backends won't support some parameters
if backing in ('aufs', 'dir', 'overlayfs', 'btrfs'):
lvname = vgname = None
@ -3117,7 +3117,7 @@ def set_dns(name, dnsservers=None, searchdomains=None, path=None):
# - We also teach resolvconf to use the aforementioned dns.
# - We finally also set /etc/resolv.conf in all cases
rstr = __salt__['test.rand_str']()
# no tmp here, apparmor wont let us execute !
# no tmp here, apparmor won't let us execute !
script = '/sbin/{0}_dns.sh'.format(rstr)
DNS_SCRIPT = "\n".join([
# 'set -x',
@ -3178,7 +3178,7 @@ def running_systemd(name, cache=True, path=None):
ret = __context__.get(k, None)
if ret is None or not cache:
rstr = __salt__['test.rand_str']()
# no tmp here, apparmor wont let us execute !
# no tmp here, apparmor won't let us execute !
script = '/sbin/{0}_testsystemd.sh'.format(rstr)
# ubuntu already had since trusty some bits of systemd but was
# still using upstart ...
@ -4285,7 +4285,7 @@ def read_conf(conf_file, out_format='simple'):
out_format:
set to 'simple' if you need the old and unsupported behavior.
This wont support the multiple lxc values (eg: multiple network nics)
This won't support the multiple lxc values (eg: multiple network nics)
CLI Examples:

2
salt/modules/mount.py
View file

@ -203,7 +203,7 @@ def active(extended=False):
class _fstab_entry(object):
'''
Utility class for manipulating fstab entries. Primarily we're parsing,
formating, and comparing lines. Parsing emits dicts expected from
formatting, and comparing lines. Parsing emits dicts expected from
fstab() or raises a ValueError.
Note: We'll probably want to use os.normpath and os.normcase on 'name'

2
salt/modules/tomcat.py
View file

@ -10,7 +10,7 @@ If the manager webapp is not configured some of the functions won't work.
- If ipv6 is enabled make sure you permit manager access to ipv6 interface
"0:0:0:0:0:0:0:1"
- If you are using tomcat.tar.gz it has to be installed or symlinked under
``/opt``, preferrably using name tomcat
``/opt``, preferably using name tomcat
- "tomcat.signal start/stop" works but it does not use the startup scripts
The following grains/pillar should be set:

2
salt/modules/x509.py
View file

@ -639,7 +639,7 @@ def create_private_key(path=None, text=False, bits=2048):
If ``True``, return the PEM text without writing to a file. Default ``False``.
bits:
Lenth of the private key in bits. Default 2048
Length of the private key in bits. Default 2048
CLI Example:

2
salt/returners/cassandra_cql_return.py
View file

@ -209,7 +209,7 @@ def event_return(events):
Cassandra does not support an auto-increment feature due to the
highly inefficient nature of creating a monotonically increasing
number accross all nodes in a distributed database. Each event
number across all nodes in a distributed database. Each event
will be assigned a uuid by the connecting client.
'''
for event in events:

2
salt/returners/postgres_local_cache.py
View file

@ -258,7 +258,7 @@ def save_load(jid, clear_load):
def _escape_jid(jid):
'''
Do proper formating of the jid
Do proper formatting of the jid
'''
jid = str(jid)
jid = re.sub(r"'*", "", jid)

20
salt/states/bigip.py
View file

@ -198,7 +198,7 @@ def create_node(hostname, username, password, name, address):
ret['result'] = True
ret['comment'] = 'A node by this name currently exists. No change made.'
# if it doesnt exist
# if it doesn't exist
elif existing['code'] == 404:
response = __salt__['bigip.create_node'](hostname, username, password, name, address)
@ -685,7 +685,7 @@ def create_pool(hostname, username, password, name, members=None,
ret['result'] = True
ret['comment'] = 'A pool by this name currently exists. No change made.'
# if it doesnt exist
# if it doesn't exist
elif existing['code'] == 404:
response = __salt__['bigip.create_pool'](hostname=hostname,
@ -901,7 +901,7 @@ def manage_pool(hostname, username, password, name,
else:
ret = _load_result(modified, ret)
# if it doesnt exist
# if it doesn't exist
elif existing['code'] == 404:
new = __salt__['bigip.create_pool'](hostname=hostname,
@ -1121,7 +1121,7 @@ def modify_pool(hostname, username, password, name,
else:
ret = _load_result(modified, ret)
# if it doesnt exist
# if it doesn't exist
elif existing['code'] == 404:
ret['comment'] = 'A pool with this name was not found.'
# else something else was returned
@ -2567,7 +2567,7 @@ def create_monitor(hostname, username, password, monitor_type, name, **kwargs):
ret['result'] = True
ret['comment'] = 'A monitor by this name currently exists. No change made.'
# if it doesnt exist
# if it doesn't exist
elif existing['code'] == 404:
response = __salt__['bigip.create_monitor'](hostname, username, password, monitor_type, name, **kwargs)
@ -2642,7 +2642,7 @@ def manage_monitor(hostname, username, password, monitor_type, name, **kwargs):
else:
ret = _load_result(modified, ret)
# if it doesnt exist
# if it doesn't exist
elif existing['code'] == 404:
response = __salt__['bigip.create_monitor'](hostname, username, password, monitor_type, name, **kwargs)
@ -2717,7 +2717,7 @@ def modify_monitor(hostname, username, password, monitor_type, name, **kwargs):
else:
ret = _load_result(modified, ret)
# if it doesnt exist
# if it doesn't exist
elif existing['code'] == 404:
ret['comment'] = 'A Monitor with this name was not found.'
# else something else was returned
@ -2864,7 +2864,7 @@ def create_profile(hostname, username, password, profile_type, name, **kwargs):
ret['result'] = True
ret['comment'] = 'A profile by this name currently exists. No change made.'
# if it doesnt exist
# if it doesn't exist
elif existing['code'] == 404:
response = __salt__['bigip.create_profile'](hostname, username, password, profile_type, name, **kwargs)
@ -2940,7 +2940,7 @@ def manage_profile(hostname, username, password, profile_type, name, **kwargs):
else:
ret = _load_result(modified, ret)
# if it doesnt exist
# if it doesn't exist
elif existing['code'] == 404:
response = __salt__['bigip.create_profile'](hostname, username, password, profile_type, name, **kwargs)
@ -3015,7 +3015,7 @@ def modify_profile(hostname, username, password, profile_type, name, **kwargs):
else:
ret = _load_result(modified, ret)
# if it doesnt exist
# if it doesn't exist
elif existing['code'] == 404:
ret['comment'] = 'A Profile with this name was not found.'
# else something else was returned

4
salt/states/service.py
View file

@ -290,7 +290,7 @@ def running(name, enable=None, sig=None, init_delay=None, **kwargs):
if not _available(name, ret):
return ret
# lot of custom init script wont or mis implement the status
# lot of custom init script won't or mis implement the status
# command, so it is just an indicator but can not be fully trusted
before_toggle_status = __salt__['service.status'](name, sig)
before_toggle_enable_status = __salt__['service.enabled'](name)
@ -373,7 +373,7 @@ def dead(name, enable=None, sig=None, **kwargs):
ret['result'] = True
return ret
# lot of custom init script wont or mis implement the status
# lot of custom init script won't or mis implement the status
# command, so it is just an indicator but can not be fully trusted
before_toggle_status = __salt__['service.status'](name, sig)
before_toggle_enable_status = __salt__['service.enabled'](name)

2
salt/states/x509.py
View file

@ -205,7 +205,7 @@ def private_key_managed(name,
new=False,
backup=False):
'''
Manage a private key's existance.
Manage a private key's existence.
name:
Path to the private key

2
setup.py
View file

@ -720,7 +720,7 @@ class Install(install):
raise DistutilsArgError(
'The \'--salt-{0}\' setting was passed as a global option '
'and as an option to the install command. Please only pass '
'one of them, preferrably the global option since the other '
'one of them, preferably the global option since the other '
'is now deprecated and will be removed in Salt Boron.'.format(
optname.replace('_', '-')
)

2
tests/unit/pillar/git_test.py
View file

@ -120,7 +120,7 @@ class GitPillarTestCase(TestCase, integration.AdaptedConfigurationTestCaseMixIn)
Namely, we replace the main ``ext_pillar`` entry function by one
that keeps count of its calls.
Otherwise, the fact that the :class:`MaximumRecursion` error is catched
Otherwise, the fact that the :class:`MaximumRecursion` error is caught
can go in the way on the testing.
On the current code base, this test fails if the two first lines of