Commit bfaa131d authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

fix-bug-forwarded-attributes: added some tests for CspMaster. 

Removed a bug in CspSubarray.
Specified the ska-logging version to resolve
a problem with SKA Base classes (ska-logging package changed import
style while lmc-baseclasses still use the old one).
Use pytest-forked to run tests.
parent 7e6df7ef

csp-lmc-common/conftest.py

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ def tango_context(request): 
    class_name = test_class_name.split('Test', 1)[-1]

    module = importlib.import_module("{}.{}".format("csp_lmc_common", class_name))

    klass = getattr(module, class_name)

    tango_context = DeviceTestContext(klass, properties=test_properties.get(class_name), process=True)

    tango_context = DeviceTestContext(klass, properties=test_properties.get(class_name))

    tango_context.start()

    yield tango_context

    tango_context.stop()

csp-lmc-common/csp_lmc_common/CspSubarray.py

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ class CspSubarray(SKASubarray): 
                    if dev_name in self._sc_subarray_fqdn:

                        cmd_name = evt.attr_value.name[:-17]

                        #self._sc_subarray_timeout_expired[dev_name][cmd_name] = True

                        self._timeout_expired[dev_name][cmd_name] = True

                        self._timeout_expired = True

                else:

                    log_msg = ("Unexpected change event for"

                               " attribute: {}".format(str(evt.attr_name)))

csp-lmc-common/docker/mid-cbf-mcs.yml

+13 −13
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ services: 
      - .:/csplmc



  cbfmaster:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}cbfmaster

    depends_on:
@@ -53,7 +53,7 @@ services: 




  cbfsubarray01:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}cbfsubarray01

    depends_on:
@@ -75,7 +75,7 @@ services: 




  cbfsubarray02:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}cbfsubarray02

    depends_on:
@@ -97,7 +97,7 @@ services: 




  vcc001:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}vcc001

    depends_on:
@@ -118,7 +118,7 @@ services: 




  vcc002:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}vcc002

    depends_on:
@@ -139,7 +139,7 @@ services: 




  vcc003:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}vcc003

    depends_on:
@@ -160,7 +160,7 @@ services: 




  vcc004:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}vcc004

    depends_on:
@@ -181,7 +181,7 @@ services: 




  fsp01:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}fsp01

    depends_on:
@@ -197,7 +197,7 @@ services: 
      - rsyslog-cbf:rw



  fsp02:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}fsp02

    depends_on:
@@ -213,7 +213,7 @@ services: 
      - rsyslog-cbf:rw



  fsp03:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}fsp03

    depends_on:
@@ -230,7 +230,7 @@ services: 




  fsp04:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}fsp04

    depends_on:
@@ -247,7 +247,7 @@ services: 




  tmcspsubarrayleafnodetest:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}tmcspsubarrayleafnodetest

    depends_on:
@@ -264,7 +264,7 @@ services: 
      - rsyslog-cbf:rw



  tmcspsubarrayleafnodetest2:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}tmcspsubarrayleafnodetest2

    depends_on:

csp-lmc-common/setup.cfg

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ source = csp-lmc-common 
#    ./csp-lmc/csp-lmc-common

[tool:pytest]

testpaths = tests

addopts = --verbose

addopts = --forked

          --verbose

	  --cov=csp_lmc_common

          --json-report

          --json-report-file=htmlcov/report.json

csp-lmc-common/setup.py

+3 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ setup( 
        install_requires = [

            'pytango >=9.3.1',

            'future',

            'lmcbaseclasses >=0.5.0',

            'ska_logging < 0.3.0',

            'lmcbaseclasses >=0.5.1',

        ],

        setup_requires=[

            'pytest-runner',
@@ -62,6 +63,7 @@ setup( 
            'coverage',

            'pytest-json-report',

            'pycodestyle',

            'pytest-forked',

            'mock'

        ],

      )