Merge branch 'master' of https://github.com/ISISComputingGroup/system_tests

Author: FreddieAkeroyd

Jenkinsfile

@@ -105,6 +105,8 @@ pipeline {
                 call ibex_utils/installation_and_upgrade/instrument_install_latest_build_only.bat CLEAN EPICS x86
             ) else if \"%MYJOB%\" == \"System_Tests_Win11\" (
                 call ibex_utils/installation_and_upgrade/instrument_install_latest_build_only.bat CLEAN EPICS
+            ) else if \"%MYJOB%\" == \"System_Tests_Win11_Win11\" (
+                call ibex_utils/installation_and_upgrade/instrument_install_latest_build_only.bat CLEAN EPICS x64 win11
             ) else (
                 call ibex_utils/installation_and_upgrade/instrument_install_latest_build_only.bat
             )
@@ -196,16 +198,11 @@ pipeline {
         bat """
             set \"MYJOB=${env.JOB_NAME}\"
             @echo Saving test output on node ${env.NODE_NAME}
-            robocopy "C:\\Instrument\\Var\\logs\\ioc" "%WORKSPACE%\\ioc-logs" /E /R:2 /MT /NFL /NDL /NP /NC /NS /LOG:NUL
-            robocopy "C:\\Instrument\\Var\\logs\\IOCTestFramework" "%WORKSPACE%\\ioctest-logs" /E /R:2 /MT /NFL /NDL /NP /NC /NS /LOG:NUL
-            robocopy "C:\\Instrument\\Var\\logs\\gateway" "%WORKSPACE%\\gateway-logs" /E /R:2 /MT /NFL /NDL /NP /NC /NS /LOG:NUL
-            robocopy "C:\\Instrument\\Var\\logs\\genie_python" "%WORKSPACE%\\genie_python-logs" /E /R:2 /MT /NFL /NDL /NP /NC /NS /LOG:NUL
-            robocopy "C:\\Instrument\\Var\\logs\\deploy" "%WORKSPACE%\\deploy-logs" /E /R:2 /MT /NFL /NDL /NP /NC /NS /LOG:NUL
-            robocopy "C:\\Instrument\\Var\\logs\\ibex_server" "%WORKSPACE%\\ibex_server-logs" /E /R:2 /MT /NFL /NDL /NP /NC /NS /LOG:NUL
+            robocopy "C:\\Instrument\\Var\\logs" "%WORKSPACE%\\var-logs" /S /R:2 /MT /NFL /NDL /NP /NC /NS /LOG:NUL
             robocopy "C:\\Instrument\\Apps\\EPICS-%MYJOB%" "%WORKSPACE%\\ioctest-output" "*.xml" /S /PURGE /R:2 /MT /NFL /NDL /NP /NC /NS /LOG:NUL
             exit /b 0
         """
-        archiveArtifacts artifacts: '*-logs/*.log', caseSensitive: false
+        archiveArtifacts artifacts: 'var-logs/**/*.*', caseSensitive: false
         junit "test-reports/**/*.xml,**/test-reports/**/*.xml"
 		logParser ([
             projectRulePath: 'log_parse_rules.txt',

clear_logs.bat

@@ -1,12 +1,5 @@
 setlocal
-pushd c:\
-del /q C:\Instrument\Var\logs\ioc\*.*
-del /q C:\Instrument\Var\logs\conserver\*.*
-del /q C:\Instrument\Var\logs\gateway\blockserver\*.*
-del /q C:\Instrument\Var\logs\gateway\external\*.*
-del /q C:\Instrument\Var\logs\genie_python\*.*
-del /q C:\Instrument\Var\logs\deploy\*.*
-del /q C:\Instrument\Var\logs\ibex_server\*.*
-del /q C:\Instrument\Var\logs\IOCTestFramework\*.*
+pushd C:\Instrument\Var\logs
+del /q /s *.*
 popd
 exit /b 0

requirements.txt

@@ -9,4 +9,5 @@ six
 unittest-xml-reporting
 ibex_bluesky_core
 genie_python
-configobj
+matplotlib
+pyqt6

test_bluesky.py

@@ -2,13 +2,17 @@
 import os
 import unittest
 import uuid
+from pathlib import Path
 
 import bluesky.plan_stubs as bps
 import bluesky.plans as bp
+import matplotlib
 from bluesky.callbacks import LiveTable
 from bluesky.preprocessors import subs_decorator
 from bluesky.run_engine import RunEngine, RunEngineResult
 from genie_python import genie as g  # type: ignore
+from ibex_bluesky_core.callbacks import ISISCallbacks
+from ibex_bluesky_core.callbacks.fitting.fitting_utils import Linear
 from ibex_bluesky_core.devices import get_pv_prefix
 from ibex_bluesky_core.devices.block import block_r, block_rw_rbv
 from ibex_bluesky_core.devices.simpledae import SimpleDae
@@ -20,7 +24,10 @@
     GoodFramesNormalizer,
     PeriodGoodFramesNormalizer,
 )
-from ibex_bluesky_core.devices.simpledae.waiters import GoodFramesWaiter, PeriodGoodFramesWaiter
+from ibex_bluesky_core.devices.simpledae.waiters import (
+    GoodFramesWaiter,
+    PeriodGoodFramesWaiter,
+)
 from ibex_bluesky_core.log import set_bluesky_log_levels
 from ibex_bluesky_core.run_engine import get_run_engine
 from ophyd_async.plan_stubs import ensure_connected
@@ -30,6 +37,7 @@
     set_genie_python_raises_exceptions,
 )
 
+matplotlib.use("qtagg")
 RE: RunEngine = get_run_engine()
 
 P3_INIT_VALUE: float = 123.456
@@ -147,6 +155,29 @@ def _plan():
         self.assertTrue(any("|    123.456 |  -10.00000 |" in line for line in livetable_lines))
         self.assertTrue(any("|    123.456 |   10.00000 |" in line for line in livetable_lines))
 
+    def test_scan_with_standard_callbacks(self) -> None:
+        icc = ISISCallbacks(
+            x="p5",
+            y="p3",
+            fit=Linear().fit(),
+            human_readable_file_output_dir=Path(LOG_FOLDER) / "output_files",
+            live_fit_logger_output_dir=Path(LOG_FOLDER) / "fitting",
+        )
+
+        @icc
+        def _plan():
+            p3 = block_r(float, "p3")
+            p5 = block_rw_rbv(float, "p5")
+            yield from ensure_connected(p3, p5)
+            yield from bp.scan([p3], p5, -10, 10, num=10)
+
+        RE(_plan())
+
+        self.assertAlmostEqual(icc.peak_stats["com"], 0)
+        print(icc.live_fit.result.params["c0"])
+        print(icc.live_fit.result.fit_report())
+        self.assertAlmostEqual(icc.live_fit.result.params["c0"], P3_INIT_VALUE)
+
     def test_count_simple_dae(self) -> None:
         start_run_number = int(g.get_runnumber())
 
@@ -211,7 +242,9 @@ def test_GIVEN_logging_is_requested_THEN_the_log_file_exists(self) -> None:
         )
         self.assertTrue(os.path.exists(self.qualified_log_filename))
 
-    def test_GIVEN_logging_is_requested_THEN_the_log_file_contains_the_message(self) -> None:
+    def test_GIVEN_logging_is_requested_THEN_the_log_file_contains_the_message(
+        self,
+    ) -> None:
         # Log invocation.
         bluesky_message = LOG_MESSAGE + str(uuid.uuid4())
         other_message = LOG_MESSAGE + str(uuid.uuid4())
@@ -240,7 +273,9 @@ def test_GIVEN_logging_is_configured_at_info_level_THEN_debug_messages_do_not_go
             self.assertNotIn(debug_msg, content)
             self.assertIn(info_msg, content)
 
-    def test_GIVEN_logging_is_configured_at_debug_level_THEN_debug_messages_do_go_to_log_file(self):
+    def test_GIVEN_logging_is_configured_at_debug_level_THEN_debug_messages_do_go_to_log_file(
+        self,
+    ):
         debug_msg = LOG_MESSAGE + str(uuid.uuid4())
         info_msg = LOG_MESSAGE + str(uuid.uuid4())
 

test_genie_python_using_simple.py

@@ -121,7 +121,7 @@ def test_GIVE_config_with_bi_pv_WHEN_set_pv_value_with_None_THEN_value_is_not_se
         bi_pv_name = "SIMPLE:BI"
         value_at_start = g.get_pv(bi_pv_name, is_local=True)
         g.set_pv(bi_pv_name, None, is_local=True, wait=True)
-        assert_that(g.get_pv(bi_pv_name), is_(value_at_start))
+        assert_that(g.get_pv(bi_pv_name, is_local=True), is_(value_at_start))
 
 
 class TestWaitforPV(unittest.TestCase):