Testing Chart error

Author: rbonghi

Diff for: jtop/gui/jtopgui.py

@@ -25,7 +25,6 @@
 # Get variables
 from ..core.common import get_var
 # Graphics elements
-from .lib.chart import Chart
 from .lib.colors import NColors
 from .lib.common import check_curses, set_xterm_title
 # Create logger
@@ -100,9 +99,6 @@ def __init__(self, stdscr, jetson, pages, init_page=0, start=True, loop=False, s
         if start:
             self.run(loop, seconds)
 
-    def __del__(self):
-        Chart.reset_color_counter()
-
     def run(self, loop, seconds):
         # In this program, we don't want keystrokes echoed to the console,
         # so we run this to disable that

Diff for: jtop/gui/lib/chart.py

@@ -97,7 +97,7 @@ def __init__(self, jetson, name, callback, type_value=int, line="*", color_text=
 
     @classmethod
     def reset_color_counter(cls):
-        Chart.COLOR_COUNTER = 0
+        cls.COLOR_COUNTER = 0
 
     def __del__(self):
         # Remove from color counter

Diff for: jtop/tests/test_05_gui.py

@@ -24,6 +24,13 @@
 from ..gui import JTOPGUI, ALL, GPU, CPU, MEM, ENGINE, CTRL, INFO
 
 
+@pytest.fixture(autouse=True)
+def reset_cube_test():
+    Chart.reset_color_counter()
+    yield
+    Chart.reset_color_counter()
+
+
 def openGUI(stdscr, jetson):
     # Initialization Menu
     pages = [ALL]
@@ -44,15 +51,14 @@ def test_openGUI(setup_jtop_server):
     curses.start_color()
     # Reset counter charts
     Chart.reset_color_counter()
+    assert Chart.COLOR_COUNTER == 0
     # Run jtop
     with jtop() as jetson:
         if jetson.ok():
             # Open JTOPGUI
             pages = openGUI(stdscr, jetson)
             # Start with selected page
             pages.set(0)
-    # Reset counter charts
-    Chart.reset_color_counter()
     assert True