Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
45b803ef
Commit
45b803ef
authored
Oct 14, 2015
by
James Cammarata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Properly use test_loader from SharedPluginLoaderObj
parent
cb9f350c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
lib/ansible/plugins/strategy/__init__.py
+2
-1
lib/ansible/template/__init__.py
+3
-1
No files found.
lib/ansible/plugins/strategy/__init__.py
View file @
45b803ef
...
...
@@ -35,7 +35,7 @@ from ansible.playbook.handler import Handler
from
ansible.playbook.helpers
import
load_list_of_blocks
from
ansible.playbook.included_file
import
IncludedFile
from
ansible.playbook.role
import
hash_params
from
ansible.plugins
import
action_loader
,
connection_loader
,
filter_loader
,
lookup_loader
,
module_loader
from
ansible.plugins
import
action_loader
,
connection_loader
,
filter_loader
,
lookup_loader
,
module_loader
,
test_loader
from
ansible.template
import
Templar
from
ansible.vars.unsafe_proxy
import
wrap_var
...
...
@@ -59,6 +59,7 @@ class SharedPluginLoaderObj:
self
.
action_loader
=
action_loader
self
.
connection_loader
=
connection_loader
self
.
filter_loader
=
filter_loader
self
.
test_loader
=
test_loader
self
.
lookup_loader
=
lookup_loader
self
.
module_loader
=
module_loader
...
...
lib/ansible/template/__init__.py
View file @
45b803ef
...
...
@@ -130,9 +130,11 @@ class Templar:
if
shared_loader_obj
:
self
.
_filter_loader
=
getattr
(
shared_loader_obj
,
'filter_loader'
)
self
.
_test_loader
=
getattr
(
shared_loader_obj
,
'test_loader'
)
self
.
_lookup_loader
=
getattr
(
shared_loader_obj
,
'lookup_loader'
)
else
:
self
.
_filter_loader
=
filter_loader
self
.
_test_loader
=
test_loader
self
.
_lookup_loader
=
lookup_loader
# flags to determine whether certain failures during templating
...
...
@@ -183,7 +185,7 @@ class Templar:
if
self
.
_tests
is
not
None
:
return
self
.
_tests
.
copy
()
plugins
=
[
x
for
x
in
test_loader
.
all
()]
plugins
=
[
x
for
x
in
self
.
_
test_loader
.
all
()]
self
.
_tests
=
dict
()
for
fp
in
plugins
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment