hardens tests for PR#41 with ida 7.3 updates (#43)

* fix plugin flags for ida7.3 * fixes tests * rm trailing space
BinaryAnalysisPlatform · Nov 13, 2019 · dfa632a · dfa632a
1 parent 77947fc
commit dfa632a
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 14 deletions.
diff --git a/plugins/bap/plugins/bap_bir_attr.py b/plugins/bap/plugins/bap_bir_attr.py
@@ -50,7 +50,7 @@ class BapBirAttr(idaapi.plugin_t):
 
     Also supports installation of callbacks using install_callback()
     """
-    flags = idaapi.PLUGIN_DRAW
+    flags =  idaapi.PLUGIN_FIX | idaapi.PLUGIN_DRAW
     comment = "Run BAP "
     help = "Runs BAP and extracts data from the output"
     wanted_name = "BAP: Run"

diff --git a/plugins/bap/plugins/bap_clear_comments.py b/plugins/bap/plugins/bap_clear_comments.py
@@ -6,7 +6,7 @@
 
 
 class BapClearComments(idaapi.plugin_t):
-    flags = idaapi.PLUGIN_DRAW
+    flags = idaapi.PLUGIN_DRAW | idaapi.PLUGIN_FIX
     comment = "removes all BAP comments"
     help = ""
     wanted_name = "BAP: Clear comments"

diff --git a/plugins/bap/plugins/bap_comments.py b/plugins/bap/plugins/bap_comments.py
@@ -27,7 +27,7 @@ def OnGetLine(self, n):
 
 
 class BapComment(idaapi.plugin_t):
-    flags = 0
+    flags = idaapi.PLUGIN_FIX
     help = 'propagate comments to IDA Views'
     comment = ''
     wanted_name = 'BAP: View BAP Attributes'

diff --git a/plugins/bap/plugins/bap_task_manager.py b/plugins/bap/plugins/bap_task_manager.py
@@ -42,7 +42,7 @@ def OnSelectionChange(self, selected):
 
 class BapTaskManager(idaapi.plugin_t):
     #pylint: disable=no-init
-    flags = idaapi.PLUGIN_DRAW
+    flags =  idaapi.PLUGIN_FIX | idaapi.PLUGIN_DRAW
     wanted_hotkey = "Ctrl-Alt-Shift-F5"
     comment = "bap task manager"
     help = "Open BAP Task Manager"

diff --git a/plugins/bap/plugins/bap_trace.py b/plugins/bap/plugins/bap_trace.py
@@ -589,7 +589,7 @@ def display():
 class BapTracePlugin(idaapi.plugin_t):
     wanted_name = 'BAP: Load Observations'
     wanted_hotkey = ''
-    flags = 0
+    flags =  idaapi.PLUGIN_FIX
     comment = 'Load Primus Observations'
     help = """
     Loads Primus Observations into IDA for further analysis

diff --git a/plugins/bap/plugins/bap_view.py b/plugins/bap/plugins/bap_view.py
@@ -62,7 +62,7 @@ class BapView(idaapi.plugin_t):
     Keybindings:
         Ctrl-Shift-F5  : Open/Refresh BAP View
     """
-    flags = idaapi.PLUGIN_DRAW
+    flags = idaapi.PLUGIN_FIX | idaapi.PLUGIN_DRAW
     wanted_hotkey = "Ctrl-Shift-F5"
     comment = "bap output viewer"
     help = "View BAP output"

diff --git a/plugins/bap/utils/bap_taint.py b/plugins/bap/utils/bap_taint.py
@@ -91,7 +91,7 @@ def __init__(self, addr, kind):
 
 
 class BapTaint(idaapi.plugin_t):
-    flags = 0
+    flags = idaapi.PLUGIN_FIX
     comment = "BAP Taint Plugin"
     wanted_name = "BAP: Taint"
 

diff --git a/plugins/bap/utils/hexrays.py b/plugins/bap/utils/hexrays.py
@@ -52,7 +52,7 @@ class PseudocodeVisitor(idaapi.plugin_t):
     class.
     """
 
-    flags = idaapi.PLUGIN_PROC
+    flags = idaapi.PLUGIN_FIX | idaapi.PLUGIN_PROC
     wanted_hotkey = ""
 
     def visit_line(self, line):

diff --git a/tests/mockidaapi.py b/tests/mockidaapi.py
@@ -1,11 +1,12 @@
 # flake8: noqa
 
-ASKBTN_YES = NotImplemented
-ASKBTN_NO = NotImplemented
-ASKBTN_CANCEL = NotImplemented
-PLUGIN_DRAW = NotImplemented
-PLUGIN_HIDE = NotImplemented
-PLUGIN_KEEP = NotImplemented
+ASKBTN_YES = 0
+ASKBTN_NO = 0
+ASKBTN_CANCEL = 0
+PLUGIN_DRAW = 0
+PLUGIN_HIDE = 0
+PLUGIN_KEEP = 0
+PLUGIN_FIX = 0
 class plugin_t(object): pass
 class text_sink_t(object): pass
 class Choose2(object): pass