diff options
| author | Caroline Leman <caroline.leman@cea.fr> | 2015-08-05 10:24:44 +0200 |
|---|---|---|
| committer | Caroline Leman <caroline.leman@cea.fr> | 2015-08-05 13:46:29 +0200 |
| commit | 159979fca5aee2ebfedacf2ad904e542761043cc (patch) | |
| tree | 5548597dae504ad8b2ff53ec5a0a39fa6b521152 /test/analysis/depgraph.py | |
| parent | b8b0e21a267b7f60ec31cc4a8f9cfa71e6c8798b (diff) | |
| download | miasm-159979fca5aee2ebfedacf2ad904e542761043cc.tar.gz miasm-159979fca5aee2ebfedacf2ad904e542761043cc.zip | |
Analysis/Depgraph: pylint and pep8 compliance + docstrings
Diffstat (limited to 'test/analysis/depgraph.py')
| -rw-r--r-- | test/analysis/depgraph.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/test/analysis/depgraph.py b/test/analysis/depgraph.py index 760eeca1..86aa1749 100644 --- a/test/analysis/depgraph.py +++ b/test/analysis/depgraph.py @@ -133,15 +133,15 @@ class DepNodeTest(DiGraph): return True def node2str(self, node): - assert(node.label in self.ira.blocs) - out = "(%s, %s, %s)\\l"%(node.label.name, + assert node.label in self.ira.blocs + out = "(%s, %s, %s)\\l" % (node.label.name, node.element, node.line_nb) - if not (0 <= node.line_nb < len(self.ira.blocs[node.label].irs)): + if not 0 <= node.line_nb < len(self.ira.blocs[node.label].irs): return out exprs = self.ira.blocs[node.label].irs[node.line_nb] exprs_str = '\\l'.join([str(x) for x in exprs]) - return "%s %s"%(out, exprs_str) + return "%s %s" % (out, exprs_str) # Test structures print "[+] Test structures" @@ -1007,7 +1007,6 @@ G14_TEST2_1.add_uniq_edge(G14_TEST2_0_DN7, G14_TEST1_1_DN7) G14_TEST2_1.add_uniq_edge(G14_TEST2_0_DN7, G14_TEST1_1_DN8) - DN14_UR_D = DependencyNode(G14_IRB0.label, D, 0, 0).nostep_repr DN14_UR_C = DependencyNode(G14_IRB0.label, C, 0, 0).nostep_repr @@ -1142,7 +1141,7 @@ for test_nb, test in enumerate([(G1_IRA, G1_INPUT, G1_OUTPUT), # Test public APIs for api_i, g_list in enumerate( - [g_dep.get_fromDepNodes(depnodes, heads), + [g_dep.get_from_depnodes(depnodes, heads), g_dep.get(list(depnodes)[0].label, [depnode.element for depnode in depnodes], @@ -1202,12 +1201,12 @@ for test_nb, test in enumerate([(G1_IRA, G1_INPUT, G1_OUTPUT), error = "emul" found = False for exp_nb in xrange(len(g_list)): - if (emul_result == g_test_output["emul"][exp_nb] and + if (emul_result == g_test_output["emul"][exp_nb] and getattr(result, "unresolved") == g_test_output[unresolved_test_key][exp_nb] and g_test_output["has_loop"][exp_nb] == getattr(result, "has_loop") - ): + ): found = True break assert found |