Skip to content

Commit 9fba742

Browse files
committed
Tests: fix Python 2.6 compatibility
1 parent 8fb2ed9 commit 9fba742

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

fabtools/tests/test_system.py

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
1-
try:
2-
import unittest2 as unittest
3-
except ImportError:
4-
import unittest
5-
61
from mock import patch
72

3+
import pytest
84

9-
class TestUnsupportedFamily(unittest.TestCase):
105

11-
def test_unsupported_system(self):
6+
def test_unsupported_system():
127

13-
from fabtools.system import UnsupportedFamily
8+
from fabtools.system import UnsupportedFamily
149

15-
with self.assertRaises(UnsupportedFamily) as cm:
10+
with pytest.raises(UnsupportedFamily) as excinfo:
1611

17-
with patch('fabtools.system.distrib_id') as mock_distrib_id:
18-
mock_distrib_id.return_value = 'foo'
12+
with patch('fabtools.system.distrib_id') as mock_distrib_id:
13+
mock_distrib_id.return_value = 'foo'
1914

20-
raise UnsupportedFamily(supported=['debian', 'redhat'])
15+
raise UnsupportedFamily(supported=['debian', 'redhat'])
2116

22-
exception_msg = str(cm.exception)
23-
self.assertEquals(exception_msg, "Unsupported system foo (supported families: debian, redhat)")
17+
exception_msg = str(excinfo.value)
18+
assert exception_msg == "Unsupported system foo (supported families: debian, redhat)"

0 commit comments

Comments
 (0)