From 911c743148dec8cf5bc826ec8e45dc718a7b6151 Mon Sep 17 00:00:00 2001
From: Dominik <dominik.moeslinger@univie.ac.at>
Date: Wed, 26 May 2021 17:39:06 +0200
Subject: [PATCH] Contiuned Improvements on TST, Progress Viewer, Code Blocks
and executions details
---
Ccs/ccs_function_lib.py | 22 +++++++++++++++++++++-
Tst/config_editor/config_editor.py | 3 +++
Tst/log_viewer/log_viewer.py | 4 ++++
Tst/progress_view/progress_view.py | 4 ++++
Tst/tst/generator_templates/run_header.py | 5 +++--
Tst/tst/generator_templates/run_step.py | 6 +++---
Tst/tst/tst.py | 9 +++++----
7 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/Ccs/ccs_function_lib.py b/Ccs/ccs_function_lib.py
index a2f4a45..052999a 100644
--- a/Ccs/ccs_function_lib.py
+++ b/Ccs/ccs_function_lib.py
@@ -3437,7 +3437,6 @@ def savepool(filename, pool_name, mode='binary', st_filter=None):
def get_packets_from_pool(pool_name, indices=[], st=None, sst=None, apid=None, dbsession=None):
"""
-
@param pool_name:
@param indices:
@param st:
@@ -3472,6 +3471,27 @@ def get_packets_from_pool(pool_name, indices=[], st=None, sst=None, apid=None, d
new_session.close()
return ret
+def add_tst_import_paths():
+ """
+ Include all paths to TST files that could potentially be used.
+ """
+ # Add general tst path
+ sys.path.append(confignator.get_option('paths', 'tst'))
+ # Add all subfolders
+ sys.path.append(confignator.get_option('paths', 'tst') + '/codeblockreusefeature')
+ sys.path.append(confignator.get_option('paths', 'tst') + '/config_editor')
+ sys.path.append(confignator.get_option('paths', 'tst') + '/confignator')
+ sys.path.append(confignator.get_option('paths', 'tst') + '/doc')
+ sys.path.append(confignator.get_option('paths', 'tst') + '/icon_univie')
+ sys.path.append(confignator.get_option('paths', 'tst') + '/images')
+ sys.path.append(confignator.get_option('paths', 'tst') + '/log_viewer')
+ sys.path.append(confignator.get_option('paths', 'tst') + '/notes')
+ sys.path.append(confignator.get_option('paths', 'tst') + '/progress_view')
+ sys.path.append(confignator.get_option('paths', 'tst') + '/sketch_desk')
+ sys.path.append(confignator.get_option('paths', 'tst') + '/test_specs')
+ sys.path.append(confignator.get_option('paths', 'tst') + '/testing_library')
+ sys.path.append(confignator.get_option('paths', 'tst') + '/tst')
+ return
class TestReport:
diff --git a/Tst/config_editor/config_editor.py b/Tst/config_editor/config_editor.py
index f3160f4..09bfffd 100644
--- a/Tst/config_editor/config_editor.py
+++ b/Tst/config_editor/config_editor.py
@@ -42,6 +42,9 @@ import gi
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk, Gio, GLib, Gdk
import confignator
+sys.path.append(confignator.get_option('paths', 'ccs'))
+import ccs_function_lib as cfl
+cfl.add_tst_import_paths()
app_name = 'Configuration Editor'
dbus_name = 'smile.tst.configeditor'
diff --git a/Tst/log_viewer/log_viewer.py b/Tst/log_viewer/log_viewer.py
index a0c763d..cd3334c 100755
--- a/Tst/log_viewer/log_viewer.py
+++ b/Tst/log_viewer/log_viewer.py
@@ -9,6 +9,10 @@ import confignator
import logging
import toolbox
import dbus
+import sys
+sys.path.append(confignator.get_option('paths', 'ccs'))
+import ccs_function_lib as cfl
+cfl.add_tst_import_paths()
uni_grau = '#666666'
uni_weiss = '#ffffff'
diff --git a/Tst/progress_view/progress_view.py b/Tst/progress_view/progress_view.py
index 57ca2c6..cd0f9de 100644
--- a/Tst/progress_view/progress_view.py
+++ b/Tst/progress_view/progress_view.py
@@ -14,6 +14,10 @@ import data_model
import json
import confignator
import toolbox
+import sys
+sys.path.append(confignator.get_option('paths', 'ccs'))
+import ccs_function_lib as cfl
+cfl.add_tst_import_paths()
# create a logger
diff --git a/Tst/tst/generator_templates/run_header.py b/Tst/tst/generator_templates/run_header.py
index 7d6bfdb..f339e6e 100644
--- a/Tst/tst/generator_templates/run_header.py
+++ b/Tst/tst/generator_templates/run_header.py
@@ -57,5 +57,6 @@ if False:
# Run the test step by step
#! CCS.BREAKPOINT
-# Exectute the preconditions
-threading.Thread(target=testinstance.establish_preconditions, kwargs={'pool_name': pool_name}, daemon=True).start()
+if False:
+ # Exectute the preconditions
+ threading.Thread(target=testinstance.establish_preconditions, kwargs={'pool_name': pool_name}, daemon=True).start()
diff --git a/Tst/tst/generator_templates/run_step.py b/Tst/tst/generator_templates/run_step.py
index 417aea8..24e7565 100644
--- a/Tst/tst/generator_templates/run_step.py
+++ b/Tst/tst/generator_templates/run_step.py
@@ -1,3 +1,3 @@
-#! CCS.BREAKPOINT
-# Step $testStepNumber: $testStepDescription Comment: $testStepComment
-threading.Thread(target=testinstance.step_$testStepNumber, kwargs={'pool_name': pool_name}, daemon=True).start()
+ #! CCS.BREAKPOINT
+ # Step $testStepNumber: $testStepDescription Comment: $testStepComment
+ threading.Thread(target=testinstance.step_$testStepNumber, kwargs={'pool_name': pool_name}, daemon=True).start()
diff --git a/Tst/tst/tst.py b/Tst/tst/tst.py
index 0eecd36..68e7a76 100755
--- a/Tst/tst/tst.py
+++ b/Tst/tst/tst.py
@@ -7,17 +7,18 @@ import gi
gi.require_version('Gtk', '3.0')
gi.require_version('GtkSource', '3.0')
from gi.repository import Gtk, Gdk, Gio, GtkSource, GLib
+import confignator
+import sys
+sys.path.append(confignator.get_option('paths', 'ccs'))
+import ccs_function_lib as cfl
+cfl.add_tst_import_paths()
import view
import data_model
import file_management
import tst_logger
import generator
-import confignator
import codeblockreuse
import connect_apps
-import sys
-sys.path.append(confignator.get_option('paths', 'ccs'))
-import ccs_function_lib as cfl
import dbus
import toolbox
--
GitLab