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

Merge branch '2014.7' into develop

Browse Source 
Conflicts:
	tests/unit/modules/boto_vpc_test.py
This commit is contained in:
Pedro Algarvio 2014-12-02 01:40:47 +00:00
commit 55b68c389d
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit/modules/boto_vpc_test.py
View File

@ -1,11 +1,7 @@
# -*- coding: utf-8 -*-
# import Python Third Party Libs
# import Third Party Libs
from salttesting.mock import patch
from salt.exceptions import SaltInvocationError, CommandExecutionError
from salt.modules.boto_vpc import _maybe_set_name_tag, _maybe_set_tags
# pylint: disable=import-error,no-name-in-module
try:
import boto
@ -41,6 +37,8 @@ from distutils.version import LooseVersion # pylint: disable=no-name-in-module
# Import Salt Libs
from salt.modules import boto_vpc
from salt.exceptions import SaltInvocationError, CommandExecutionError
from salt.modules.boto_vpc import _maybe_set_name_tag, _maybe_set_tags
# Import Salt Testing Libs
from salttesting import skipIf, TestCase

2
tests/unit/modules/zcbuildout_test.py
View File

@ -140,7 +140,6 @@ class BuildoutTestCase(Base):
def callback2(a, b=1):
raise Exception('foo')
# pylint: disable=invalid-sequence-index
ret1 = callback1(1, b=3)
self.assertEqual(ret1['status'], True)
self.assertEqual(ret1['logs_by_level']['warn'], ['wbar'])
@ -174,7 +173,6 @@ class BuildoutTestCase(Base):
self.assertEqual(ret2['out'], None)
for l in buildout.LOG.levels:
self.assertTrue(0 == len(buildout.LOG.by_level[l]))
# pylint: enable=invalid-sequence-index
@requires_network()
def test_get_bootstrap_url(self):