X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Ftools%2FRobot_Tool%2Flibraries%2Ftestmodule.py;h=6ac3478451422ed396edb2b6f7935700bcd21b6e;hb=072f6e3a8d1bdf8f4c663843589c22d93ba07791;hp=928b67b0bfa2334a98975656134f8395a0cf33d8;hpb=067f71f16cd5e4b56af61ed9306145993b1696a1;p=integration%2Ftest.git diff --git a/test/tools/Robot_Tool/libraries/testmodule.py b/test/tools/Robot_Tool/libraries/testmodule.py index 928b67b0bf..6ac3478451 100644 --- a/test/tools/Robot_Tool/libraries/testmodule.py +++ b/test/tools/Robot_Tool/libraries/testmodule.py @@ -4,7 +4,7 @@ Authors: Baohua Yang@IBM, Denghui Huang@IBM Updated: 2013-10-30 """ -from restlib import * +from restlib import * # noqa class TestModule(object): @@ -22,12 +22,11 @@ class TestModule(object): self.contentType = contentType self.prefix = prefix - def extract_properties(self, content, key, property): """ Return all nodes. """ - if not isinstance(content, dict) or not content.has_key(key): + if not isinstance(content, dict) or key not in content: return None else: return [e.get(property) for e in content[key]] @@ -63,13 +62,13 @@ class TestModule(object): def test_add_remove_operations(self, suffix_entries, suffix_entry, name, body, key): result = [] - #Add an entry + # Add an entry self.add_entry(suffix_entry, name, body) r = self.get_entries(suffix_entries, key) if r: v = r.get(key) result.append(body in v if v else False) - #Remove the added entry + # Remove the added entry if result == [True]: self.remove_entry(suffix_entry, name) r = self.get_entries(suffix_entries, key)