Task #8531: Working unitttest for TreeService.

.gitattributes

@@ -4828,6 +4828,7 @@ SAS/OTDB_Services/test/CMakeLists.txt -text
 SAS/OTDB_Services/test/t_TreeService.py -text
 SAS/OTDB_Services/test/t_TreeService.run -text svneol=unset#application/x-shellscript
 SAS/OTDB_Services/test/t_TreeService.sh -text svneol=unset#application/x-shellscript
+SAS/OTDB_Services/test/unittest_db.dump.gz -text svneol=unset#application/x-gzip
 SAS/Scheduler/src/.default_settings.set -text
 SAS/Scheduler/src/LOFAR_libScheduler.pro -text
 SAS/Scheduler/src/conflictdialog.ui -text

CMake/LofarPackageList.cmake

@@ -132,6 +132,7 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
   set(CobaltTest_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Cobalt/CobaltTest)
   set(BrokenAntennaInfo_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Cobalt/BrokenAntennaInfo)
   set(OTDB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB)
+  set(OTDB_Services_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB_Services)
   set(OTB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB)
   set(OTDB_SQL_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB/sql)
   set(Scheduler_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/Scheduler)

SAS/OTDB_Services/CMakeLists.txt

@@ -4,13 +4,11 @@
 
 include(PythonInstall)
 
-set(_py_files
-  __init__.py
+lofar_add_bin_scripts(
   TreeService.py
   TreeStatusEvents.py
 )
 
-python_install(${_py_files} DESTINATION bin)
 
 add_subdirectory(test)
 

SAS/OTDB_Services/TreeService.py

-#!/usr/bin/python
+#!/usr/bin/env python
 #coding: iso-8859-15
 #
 # Copyright (C) 2015

SAS/OTDB_Services/test/t_TreeService.py

-#!/usr/bin/python
+#!/usr/bin/env python
 #coding: iso-8859-15
 #
 # Copyright (C) 2015

SAS/OTDB_Services/test/t_TreeService.run

@@ -13,9 +13,8 @@ qpid-config add exchange topic $queue
 
 # Setup a clean database with predefined content
 dropdb -U postgres -h ${DBHOST} unittest_db
-createdb -U postgres -h ${DBHOST} unittest_db
-psql -U postgres -h ${DBHOST} -f $src_dir/unittest_db.dump
-python TreeService.py $queue -D unittest_db -H ${DBHOST} &
+gzip -dc $srcdir/unittest_db.dump.gz | psql -U postgres -h ${DBHOST} -f -
+TreeService.py $queue -D unittest_db -H ${DBHOST} &
 SERVER_PID=$!
 # Starting up takes a while
 sleep 3