changeset 766:2c7dde490d63

fix pg downgrade
author Alain Mazy <am@orthanc.team>
date Wed, 18 Dec 2024 09:30:19 +0100
parents 40e03b7d2275
children d54c9167f60e
files NewTests/Housekeeper/test_housekeeper.py NewTests/PostgresUpgrades/downgrade.sh NewTests/README
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/NewTests/Housekeeper/test_housekeeper.py	Tue Dec 17 18:11:47 2024 +0100
+++ b/NewTests/Housekeeper/test_housekeeper.py	Wed Dec 18 09:30:19 2024 +0100
@@ -76,7 +76,7 @@
         while not completed:
             print('-------------- waiting for housekeeper to finish processing')
             time.sleep(1)
-            housekeeper_status = cls.o.get_json("plugins/housekeeper/status")
+            housekeeper_status = cls.o.get_json("/plugins/housekeeper/status")
             completed = (housekeeper_status["LastProcessedConfiguration"]["StorageCompressionEnabled"] == True) \
                         and (housekeeper_status["LastChangeToProcess"] == housekeeper_status["LastProcessedChange"])
 
--- a/NewTests/PostgresUpgrades/downgrade.sh	Tue Dec 17 18:11:47 2024 +0100
+++ b/NewTests/PostgresUpgrades/downgrade.sh	Wed Dec 18 09:30:19 2024 +0100
@@ -5,7 +5,7 @@
 apt-get update && apt-get install -y wget mercurial
 hg clone https://orthanc.uclouvain.be/hg/orthanc-databases
 hg update -r default
-psql -U postgres -f /scripts/orthanc-databases/PostgreSQL/Plugins/SQL/Downgrades/Rev3bToRev2.sql
+psql -U postgres -f /scripts/orthanc-databases/PostgreSQL/Plugins/SQL/Downgrades/Rev3ToRev2.sql
 
 # if you want to test a downgrade procedure, you may use this code ...
 # psql -U postgres -f downgrade.sql
--- a/NewTests/README	Tue Dec 17 18:11:47 2024 +0100
+++ b/NewTests/README	Wed Dec 18 09:30:19 2024 +0100
@@ -50,8 +50,10 @@
 Run the Housekeeper tests with your locally build version and break between preparation
 and execution to allow you to start your debugger.
 
+//                         --orthanc_under_tests_exe=/home/alain/o/build/orthanc/Orthanc \
+
 python3 NewTests/main.py --pattern=Housekeeper.test_housekeeper.TestHousekeeper.test_before_after_reconstruction \
-                         --orthanc_under_tests_exe=/home/alain/o/build/orthanc/Orthanc \
+                         --orthanc_under_tests_docker_image=orthancteam/orthanc:current \
                          --orthanc_under_tests_http_port=8043 \
                          --plugin=/home/alain/o/build/orthanc/libHousekeeper.so \
                          --break_after_preparation