diff options
| author | Joshua Harlow <harlowja@gmail.com> | 2016-05-19 14:26:30 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@gmail.com> | 2016-05-19 14:26:30 -0700 |
| commit | 6b97c4e462b19374d6af807b1f5b9c087aa97996 (patch) | |
| tree | 3628a55f69b61644a519d5df40398d55ba55186c /tests/unittests/test_cli.py | |
| parent | ea4bc2c603a9d964a918e01d00e39a851e979830 (diff) | |
| parent | 880d9fc2f9c62abf19b1506595aa81e5417dea45 (diff) | |
| download | vyos-cloud-init-6b97c4e462b19374d6af807b1f5b9c087aa97996.tar.gz vyos-cloud-init-6b97c4e462b19374d6af807b1f5b9c087aa97996.zip | |
Remerge against head/master
Diffstat (limited to 'tests/unittests/test_cli.py')
| -rw-r--r-- | tests/unittests/test_cli.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/unittests/test_cli.py b/tests/unittests/test_cli.py index f537bd83..163ce64c 100644 --- a/tests/unittests/test_cli.py +++ b/tests/unittests/test_cli.py @@ -4,12 +4,7 @@ import six import sys from . import helpers as test_helpers - -try: - from unittest import mock -except ImportError: - import mock - +mock = test_helpers.mock BIN_CLOUDINIT = "bin/cloud-init" |