|
14 | 14 | # |
15 | 15 |
|
16 | 16 | import copy |
| 17 | +import pytest |
| 18 | + |
17 | 19 | from distutils.version import LooseVersion |
18 | 20 | from icontrol.session import iControlUnexpectedHTTPError |
19 | | -import pytest |
| 21 | +from six import iteritems |
20 | 22 |
|
21 | 23 | VERSIONS = [1, '1', '2c'] |
22 | 24 | VERSIONS_AUTH = [3, '3'] |
@@ -384,7 +386,7 @@ def test_community_modify(self, request, mgmt_root, setup_device_snapshot): |
384 | 386 | original_dict = copy.copy(comm1.__dict__) |
385 | 387 | commName = 'communityName' |
386 | 388 | comm1.modify(communityName='footest1') |
387 | | - for k, v in original_dict.items(): |
| 389 | + for k, v in iteritems(original_dict): |
388 | 390 | if k != commName: |
389 | 391 | original_dict[k] = comm1.__dict__[k] |
390 | 392 | elif k == commName: |
@@ -453,7 +455,7 @@ def test_user_modify(self, request, mgmt_root, setup_device_snapshot): |
453 | 455 | original_dict = copy.copy(user1.__dict__) |
454 | 456 | accessName = 'access' |
455 | 457 | user1.modify(access='rw') |
456 | | - for k, v in original_dict.items(): |
| 458 | + for k, v in iteritems(original_dict): |
457 | 459 | if k != accessName: |
458 | 460 | original_dict[k] = user1.__dict__[k] |
459 | 461 | elif k == accessName: |
@@ -519,7 +521,7 @@ def test_trap_create_bad_version( |
519 | 521 | port=1234, |
520 | 522 | version=badVal |
521 | 523 | ) |
522 | | - assert 'expected one of the following' in err.value.message |
| 524 | + assert 'expected one of the following' in str(err.value) |
523 | 525 |
|
524 | 526 | def test_trap_create_bad_port( |
525 | 527 | self, request, mgmt_root, setup_device_snapshot |
@@ -547,7 +549,7 @@ def test_trap_create_bad_port( |
547 | 549 | port=badVal, |
548 | 550 | version=version |
549 | 551 | ) |
550 | | - assert 'invalid or ambiguous service' in err.value.message |
| 552 | + assert 'invalid or ambiguous service' in str(err.value) |
551 | 553 |
|
552 | 554 | def test_trap_create_named_port( |
553 | 555 | self, request, mgmt_root, setup_device_snapshot |
@@ -617,7 +619,7 @@ def test_trap_modify(self, request, mgmt_root, setup_device_snapshot): |
617 | 619 | original_dict = copy.copy(trap1.__dict__) |
618 | 620 | host = 'host' |
619 | 621 | trap1.modify(host='20.20.20.20') |
620 | | - for k, v in original_dict.items(): |
| 622 | + for k, v in iteritems(original_dict): |
621 | 623 | if k != host: |
622 | 624 | original_dict[k] = trap1.__dict__[k] |
623 | 625 | elif k == host: |
|
0 commit comments