Commit 237792b9 authored by Marco Buttu's avatar Marco Buttu
Browse files

Added mscu-runserver command 

Now to use the MinorServos in test mode we just need to change
the ACS_CDB to the test CDB, and then run the mscu-runserver command.
The unit tests otherwise do not require a live server, because
each test runs it own server by importing the mscu and executing
MSCU.run().
parent 35c4de22

SRT/Servers/SRTMinorServo/src/Makefile

+18 −7
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 
#-----------------------------------------

#*****************************************



PY_PACKAGES = SRTMinorServoTest

PY_SCRIPTS = mscu-runserver



# On-Line Database Files

# ----------------------

CDB_SCHEMAS = MinorServo
@@ -13,15 +16,20 @@ CDB_SCHEMAS = MinorServo 
# ----------------------------

LIBRARIES = WPServoImpl MinorServoBossImpl



WPServoImpl_OBJECTS = WPServoImpl WPServoSocket WPServoTalker RequestDispatcher WPStatusUpdater SocketListener utils libCom WPUtils

WPServoImpl_LIBS = MinorServoStubs IRALibrary ComponentErrors SRTMinorServoLibrary MinorServoErrors

WPServoImpl_OBJECTS = WPServoImpl WPServoSocket WPServoTalker RequestDispatcher \

					  WPStatusUpdater SocketListener utils libCom WPUtils

WPServoImpl_LIBS = MinorServoStubs IRALibrary ComponentErrors \

				   SRTMinorServoLibrary MinorServoErrors



MinorServoBossImpl_OBJECTS = MinorServoBossImpl utils SetupThread ParkThread TrackingThread ScanThread MSBossPublisher libCom \

MinorServoBossImpl_OBJECTS = MinorServoBossImpl utils SetupThread ParkThread \

							 TrackingThread ScanThread MSBossPublisher libCom \

							 MSBossConfiguration

MinorServoBossImpl_LIBS = MinorServoStubs MinorServoBossStubs SRTMinorServoLibrary ManagmentDefinitionsStubs ManagementErrors \

						  IRALibrary ComponentErrors MinorServoErrors acsnc ParserErrors AntennaDefinitionsStubs MountStubs \

						  AntennaBossStubs AntennaErrors ActiveSurfaceBossStubs SRTActiveSurfaceBossStubs \

						  MinorServoDefinitionsStubs

MinorServoBossImpl_LIBS = MinorServoStubs MinorServoBossStubs SRTMinorServoLibrary \

						  ManagmentDefinitionsStubs ManagementErrors \

						  IRALibrary ComponentErrors MinorServoErrors acsnc \

						  ParserErrors AntennaDefinitionsStubs MountStubs \

						  AntennaBossStubs AntennaErrors ActiveSurfaceBossStubs \

						  SRTActiveSurfaceBossStubs MinorServoDefinitionsStubs

# ----------------------------------------------------------------------

# List of all possible C-sources (used to create automatic dependencies)

# ----------------------------------------------------------------------
@@ -49,6 +57,9 @@ clean : clean_all 
	$(RM) *~ ../include/*~ ../idl/*~ ../*~ ../../*~ core

	$(RM) ../doc/html

	$(RM) tmp.txt acsexmplbeans.jar ../doc/abeans.log

	$(RM) ../lib/python/site-packages/*

	$(RM) $(INTROOT)/lib/python/site-packages/SRTMinorServoTest

	$(RM) $(INTROOT)/bin/mscu-runserver

	@echo " . . . clean done"



clean_dist : clean clean_dist_all

SRT/Servers/SRTMinorServo/src/SRTMinorServoTest/mscu/__init__.py

0 → 100644
+0 −0

Empty file added.

SRT/Servers/SRTMinorServo/test/mscu/mscu.py→SRT/Servers/SRTMinorServo/src/SRTMinorServoTest/mscu/mscu.py

+5 −1
Original line number Diff line number Diff line
@@ -162,6 +162,10 @@ class MSCU(object): 


if __name__ == "__main__":

    mscu = MSCU()

    try:

        mscu.run()

    finally:

        db = posutils.PositionDB()

        db.clear()