Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix test failures if 'future' package is installed #15005

Merged
merged 1 commit into from
Feb 16, 2017
Merged

Fix test failures if 'future' package is installed #15005

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 1 addition & 7 deletions test/units/plugins/action/test_action.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,9 @@

import os

try:
import builtins
except ImportError:
import __builtin__ as builtins


from ansible import constants as C
from ansible.compat.six import text_type
from ansible.compat.six.moves import shlex_quote
from ansible.compat.six.moves import shlex_quote, builtins
from ansible.compat.tests import unittest
from ansible.compat.tests.mock import patch, MagicMock, mock_open

Expand Down