Update files to test the build.

.gitlab-ci.yml

@@ -35,7 +35,7 @@ test:
   stage: test
   script:
     - make build
-#    - make test
+    - make test
 #    - mv build public
 #    - make push
 #  artifacts:

Jenkinsfile

-node('docker') {
-
-    withDockerContainer(
-        image: 'tango-lmc-base-classes:latest',
-        args: '-u root'
-    ) {
-        stage 'Cleanup workspace'
-        sh 'chmod 777 -R .'
-        sh 'rm -rf *'
-
-        stage 'Checkout SCM'
-            checkout([
-                $class: 'GitSCM',
-                branches: [[name: "refs/heads/${env.BRANCH_NAME}"]],
-                extensions: [[$class: 'LocalBranch']],
-                userRemoteConfigs: scm.userRemoteConfigs,
-                doGenerateSubmoduleConfigurations: false,
-                submoduleCfg: []
-            ])
-
-        stage 'Install & Unit Tests'
-            timestamps {
-                timeout(time: 30, unit: 'MINUTES') {
-                    ansiColor('xterm') {
-                        try {
-                            // Add a symbolic link to lmc-base-classes dir, as the Ansible scripts
-                            // assume that is part of the path
-                            sh 'ln -sv $WORKSPACE ../lmc-base-classes'
-
-                            // use Ansible to do pip installs, using current WORKSPACE
-                            // as the software_root
-                            // install coverage manually, so it can be used after tests
-                            sh '''
-                                PARENT_DIR=`dirname $WORKSPACE`
-                                cd ansible
-                                ansible-playbook -i hosts install_sw.yml \
-                                  --limit "local" \
-                                  --tags install-sw-lmc-base-classes \
-                                  --tags install-sw-skabase \
-                                  --verbose \
-                                  --extra-vars software_root=$PARENT_DIR
-                                pip install coverage
-                                cd ..
-                            '''
-
-                            catchError {
-                                // run tests
-                                sh '''
-                                    python setup.py test \
-                                      --addopts="--junitxml results.xml --color=yes --cov=skabase --cov=refelt --cov-report=term --cov-config .coveragerc"
-                                '''
-                            }
-
-                            // generate HTML coverage report
-                            sh 'coverage html'
-
-                        }
-                        finally {
-                            step([$class: 'JUnitResultArchiver', testResults: 'results.xml'])
-                            archive 'htmlcov/*'
-                        }
-                    }
-                }
-            }
-    }
-}

Makefile

@@ -58,7 +58,7 @@ make = tar -c test-harness/ | \
 	   docker run -i --rm --network=$(DOCKER_NETWORK) \
 	   -e TANGO_HOST=databaseds:10000 \
 	   -v $(CACHE_VOLUME):/home/tango/.cache \
-	   --volumes-from=rsyslog-dishmaster:rw \
+	   --volumes-from=rsyslog-lmcbaseclasses:rw \
 	   -v /build -w /build -u tango $(DOCKER_RUN_ARGS) $(IMAGE_TO_TEST) \
 	   bash -c "sudo chown -R tango:tango /build && \
 	   tar x --strip-components 1 --warning=all && \
@@ -74,8 +74,10 @@ test: build  ## test the application
 	  rm -fr build; \
 	  docker cp $(BUILD):/build .; \
 	  docker rm -f -v $(BUILD); \
-	  docker logs dish-master_dishmaster_1; \
-	  docker logs dish-master_dishmaster_1 > build/container.log 2>&1; \
+#	  docker logs lmc-base-classes_lmcbaseclasses_1; \
+#	  docker logs lmc-base-classes_lmcbaseclasses_1 > build/container.log 2>&1; \
+	  docker logs $(CACHE_VOLUME); \
+	  docker logs $(CACHE_VOLUME) > build/container.log 2>&1; \
 	  DOCKER_REGISTRY_HOST=$(DOCKER_REGISTRY_HOST) DOCKER_REGISTRY_USER=$(DOCKER_REGISTRY_USER) docker-compose down; \
 	  exit $$status
 
@@ -91,7 +93,7 @@ piplock: build  ## overwrite Pipfile.lock with the image version
 interactive: up
 interactive:  ## start an interactive session using the project image (caution: R/W mounts source directory to /app)
 	docker run --rm -it --name=$(PROJECT)-dev -e TANGO_HOST=databaseds:10000 --network=$(DOCKER_NETWORK) \
-          -v $(CURDIR):/app --volumes-from=rsyslog-dishmaster:rw $(IMAGE_TO_TEST) /bin/bash
+          -v $(CURDIR):/app --volumes-from=rsyslog-lmcbaseclasses:rw $(IMAGE_TO_TEST) /bin/bash
 
 down:  ## stop develop/test environment and any interactive session
 	docker ps | grep $(PROJECT)-dev && docker stop $(PROJECT)-dev || true

docker-compose.yml

@@ -20,7 +20,7 @@ services:
   tangodb:
     image: ska-registry.av.it.pt/ska-docker/tango-db:latest
     depends_on:
-      - rsyslog-dishmaster
+      - rsyslog-lmcbaseclasses
     environment:
       - MYSQL_ROOT_PASSWORD=secret
       - MYSQL_DATABASE=tango
@@ -63,8 +63,8 @@ services:
       - TANGO_HOST=databaseds:10000
     command: >
       sh -c "wait-for-it.sh databaseds:10000 --timeout=30 --strict --
-             tango_admin --add-server DishMaster/test DishMaster test/DishMaster/01 &&\
+             tango_admin --add-server SKABaseDevice/SKABaseDevice SKABaseDevice ska/basedevice/01 &&\
              sudo ln -sf /var/run/rsyslog/dev/log /dev/log &&\
-             /venv/bin/python /app/DishMaster/DishMaster.py test"
+             /venv/bin/python /app/lmc-base-classes/skabase/SKABaseDevice.py test"
     volumes_from:
-      - rsyslog-dishmaster:rw
\ No newline at end of file
+      - rsyslog-lmcbaseclasses:rw
\ No newline at end of file

setup.py

@@ -46,6 +46,7 @@ setup(name=name,
           "pytest",
           "pytest-cov",
           "pytest-xdist"
+          "mock"
       ],
       keywords="lmc base classes ska",
       zip_safe=False)