diff --git a/.docker/Dockerfile b/.docker/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..5c61787c3de694cf5f5ae89af21bee847b13e773
--- /dev/null
+++ b/.docker/Dockerfile
@@ -0,0 +1,11 @@
+FROM debian:latest
+RUN apt-get update && \
+ apt-get install docker.io tox curl python3-pip git -y
+RUN pip3 install docker-compose
+COPY .docker/wait-for-it.sh /wait-for-it.sh
+RUN git clone https://gitlab.gwdg.de/bmp-caosdb/caosdb-pylib.git && \
+ cd caosdb-pylib && pip3 install .
+COPY . /git
+RUN rm -r /git/.git && mv /git/.docker/pycaosdb.ini /git
+WORKDIR /git
+CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- tox
diff --git a/.docker/cert/all-certs.pkcs12 b/.docker/cert/all-certs.pkcs12
new file mode 100644
index 0000000000000000000000000000000000000000..382b9cfe7dd1cec7c9f98f96c1fea63a971585ab
Binary files /dev/null and b/.docker/cert/all-certs.pkcs12 differ
diff --git a/.docker/cert/caosdb.cert.pem b/.docker/cert/caosdb.cert.pem
new file mode 100644
index 0000000000000000000000000000000000000000..af44eed0f636bb87b2672219fe14d825b4b5e9b7
--- /dev/null
+++ b/.docker/cert/caosdb.cert.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDETCCAfmgAwIBAgIUM1S4TR6nEsstWuXDjZGBv6sb0LAwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNY2Fvc2RiLXNlcnZlcjAeFw0xOTA3MTgxNDM3MzNaFw0x
+OTA4MTcxNDM3MzNaMBgxFjAUBgNVBAMMDWNhb3NkYi1zZXJ2ZXIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMFzou21Jugj9Z3YUkhXANt2oGNvuCyt9S
+IfBZO5ZpgwSTcRs8UAuKDYAMmGMeQtqLfqEYoQFEeybSd9NsrFb0IgrUaKrSNAzs
+phjsGvXU1UbMRw0vva3l6r94ceM8ecw+x2RIsTwfJkfVL60XMm9DvTaQFLzjcKLf
+lOQbXG6jgCHtvO5MThk/C+TvsAZlRDErp7HgDqDFg+jnJC5YsEFQQyAYCLJXOotQ
+A5FnRbT8dtoDHy03mHyed5Ji3IgxKxE5mF0ygG8/FRfgzqImg4FMnCb+KBwom2xh
+y2hvtFnm3+kCbB+waDTUaPZwvNUONUZMfcl3PggX0IwipqWL8DBJAgMBAAGjUzBR
+MB0GA1UdDgQWBBSglY56eKgLeyW1o5UdZgqlzDJJEjAfBgNVHSMEGDAWgBSglY56
+eKgLeyW1o5UdZgqlzDJJEjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA
+A4IBAQAF4sn/C7wx9fq/9/v6UYb9DbOXaonS+1jOzf1lAOEwHtJh0M9SDTqvaeQz
+bshJ33ZFbwH3qIq7+OzGj9Yon9LN1GGEl4CcKKQRQQkjo7jt7X47C6PkrW6l23+i
+OrDRk7Oke9BJS/ZRKLmxvlaLYULpj02lOsbddfE4igXxRPCiouosc+HQ3kd6Mqhv
+5Gt0Yki3z4fvi+CWrtUjxYeMUJkraFAyKDKwFVZgDnWwyipGo9yh3a6iXD7duQcx
+FRk7zm1oaF3ia9hFfU1AVDfkgIlPLWW30CT4Jgi25/wpiGZiT1uXAgfoJCEDoYXp
+bQIM5KQqw0Kgjqc/KuLCRe1KeCzq
+-----END CERTIFICATE-----
diff --git a/.docker/cert/caosdb.jks b/.docker/cert/caosdb.jks
new file mode 100644
index 0000000000000000000000000000000000000000..355b78fd3b60ebdb92b111ee0d81bc6f1adb8add
Binary files /dev/null and b/.docker/cert/caosdb.jks differ
diff --git a/.docker/cert/caosdb.key.pem b/.docker/cert/caosdb.key.pem
new file mode 100644
index 0000000000000000000000000000000000000000..3459474b70fbddb9b2a9080ef402c35db1713c0b
--- /dev/null
+++ b/.docker/cert/caosdb.key.pem
@@ -0,0 +1,30 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-256-CBC,0B42601A73984CD9F1DF2F786F894EA0
+
+5ZY5CR8ho3a9449XIUmSpIsCZZWsVQ1pWX+SJPSUlk2A9N3BHdY0AdvCx+sTF7p4
+bSoAulnAEFlIeXqimtK+InH0d3HLbvn41gvEbFTPjZdejxro6m9DvSHCpyDZK9TH
+m5A2aRsJioeibETUA7uvld/d9Szdz//GPN2YzWqJpzXZtTWHH/tR2J2L6KE+wBDa
+IViryBCv0+9e6l2WeEjXqqYZhznR/gUsxc2xEs7x8wEpWBVlmVzYWuSt7OA5oOm/
+r1OAR9LEH0PIISUv2h+P7ccOZJD/JE2YDM3IBdClxLv2MRyj/88ougcV5gv688+f
+6XxT2+LfCLd+viqGcFZ5a6tT1wpUthVWWvUWPna6SlVVrsj/7bCc6y2Jptff+Kqv
+eL8Gl1dWZXwe0JXr+Ss5KfIddbY0pJv8FHjCsN+Nkdozo7Wdufm1Xkw+s1f2td6u
+bHwbo1Y4mX5nm9I2OkAMhGubSPalGZRUvr9cfl1/1V/QgX0jPmJmNmH5yFUdc5MQ
+QIdcpZmz8xIH1XAdJWTbzoYKzKnXTHpZFaZL1acMrK2CERMxDStfe9W/DSRy6/qn
+AsQbh6tDk+Fe05EQwpZBZQ1YlrfAru7QDaDE9+uO+mxkf1UHynfPHNp2jZAe6XBt
+p97GXUruLR8rBOAGX19EuoG2sSek44dLW5IsLGbR1MpTlq48YZv2z3TrESNJHKAM
+VAxg5kwqvYocykdFrKmggbdBv3oo6g59RxiufKparlkI7YZFhks6V1gujKW+JChc
+Eoy8e2EJJP0pY0Pb3ZE9QkK7ZX4otXNRgqqnf2f7kTiGMRBSDSD5xGUw0syXAS3G
+Ji/4pMFh8ALsYUOOOYUISWAUB6O8/438SIq+g+TNHYVbrli/WK9ip0+RGPmJ+Ulm
+iWQMQOcsSYTBqDytvr0241JDBuq9RjMBJE4FO2ltr7L4gmkN8+d/WGnvu4onJBoE
+8ApriArJjuHBP1iex3uygJKD3sdiuAuukrPlEla1xjywH3QSzj/SWABIu4QJAr3a
+70jEFGL04eblvBPGN2hnXEQCxHqRJLpFH1huWMlO3PuoRnGxIuxymkEOOEWfswLO
+r9qLbkUWmFFFqJBNB3T4kfzuZDqiCQnS8+QNvhTiKCWLcUswXTirSac8B5cWDaqd
+/Nf119n3ezZkpzgKr0kw+kLxlU2Tbl7UBZ7TRadxklXaAmEo7z+Wh7WKmbcUMqit
+xh6P7P0ZWcLYIiXCC5gYr6jzU+Rjx4ZGF5+Q0LcXC3Ai6Ujz4zdrVRLBiw27zKgB
+RsYBCYRmQ2qO0AzHFBWixl7IVGYi+QFKU0SFrPLzme+yOJjjLAv2Xzu24KFiwHLz
+8MWCd0yM8UjXAql+jCk54O6e4QwER2Rfr6vxlH6x90diy8eJQXejBEVNIfyOpyST
+Mqn2jc5vWanVxRk/SgrZ0pOJ8TBeGSzolJF9MBPjZ9PJTbu3WzJpuguQ4CeAAV7E
+0+rbPGALnuDKmrsnyIb9WX+fEpT7oBPEKV84XyG1+UkBrfDaQvK3SujeRvnOaZLG
+uSNc8yX9CZmt2OJTRWK5fKnR5fGzAnMR7cRUYNvcWJ0T6B4wj8cwF4wY9laGzMO7
+-----END RSA PRIVATE KEY-----
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
new file mode 100644
index 0000000000000000000000000000000000000000..56de33a5c1280c82e954e97965e07efbeb40303c
--- /dev/null
+++ b/.docker/docker-compose.yml
@@ -0,0 +1,26 @@
+version: '3.7'
+services:
+ sqldb:
+ image: mariadb:10.4
+ environment:
+ MYSQL_ROOT_PASSWORD: caosdb1234
+ networks:
+ - caosnet
+ caosdb-server:
+ image: "$CI_REGISTRY/caosdb:$CAOSDB_TAG"
+ depends_on:
+ - sqldb
+ networks:
+ - caosnet
+ volumes:
+ - type: bind
+ source: "$CERTPATH"
+ target: /opt/caosdb/cert
+ ports:
+ # - "from_outside:from_inside"
+ - "10443:10443"
+ - "10080:10080"
+
+networks:
+ caosnet:
+ driver: bridge
diff --git a/.docker/pycaosdb.ini b/.docker/pycaosdb.ini
new file mode 100644
index 0000000000000000000000000000000000000000..e9c0926658bfec39744c2633f9c0357fd4221f42
--- /dev/null
+++ b/.docker/pycaosdb.ini
@@ -0,0 +1,17 @@
+[IntegrationTests]
+test_server_side_scripting.bin_dir=../caosdb-server/test_scripting/bin/
+
+[Connection]
+url=https://caosdb-server:10443
+username=admin
+cacert=.docker/cert/caosdb.cert.pem
+#cacert=/etc/ssl/cert.pem
+debug=0
+
+passwordmethod=plain
+password=caosdb
+
+ssl_insecure=True
+timeout=500
+[Container]
+debug=0
diff --git a/.docker/tester.yml b/.docker/tester.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2d22c8b32eabd3d2268b06e02929ea11542eb5fc
--- /dev/null
+++ b/.docker/tester.yml
@@ -0,0 +1,9 @@
+version: '3.7'
+services:
+ tester:
+ image: "$CI_REGISTRY_IMAGE:latest"
+ networks:
+ - docker_caosnet
+networks:
+ docker_caosnet:
+ external: true
diff --git a/.docker/wait-for-it.sh b/.docker/wait-for-it.sh
new file mode 100755
index 0000000000000000000000000000000000000000..dd6947cd8412848f9264228cb46e86874459a599
--- /dev/null
+++ b/.docker/wait-for-it.sh
@@ -0,0 +1,181 @@
+#!/usr/bin/env bash
+# TODO add proper license
+# from githu:
+# Use this script to test if a given TCP host/port are available
+
+WAITFORIT_cmdname=${0##*/}
+
+echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
+
+usage()
+{
+ cat << USAGE >&2
+Usage:
+ $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
+ -h HOST | --host=HOST Host or IP under test
+ -p PORT | --port=PORT TCP port under test
+ Alternatively, you specify the host and port as host:port
+ -s | --strict Only execute subcommand if the test succeeds
+ -q | --quiet Don't output any status messages
+ -t TIMEOUT | --timeout=TIMEOUT
+ Timeout in seconds, zero for no timeout
+ -- COMMAND ARGS Execute command with args after the test finishes
+USAGE
+ exit 1
+}
+
+wait_for()
+{
+ if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+ echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+ else
+ echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
+ fi
+ WAITFORIT_start_ts=$(date +%s)
+ while :
+ do
+ if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
+ nc -z $WAITFORIT_HOST $WAITFORIT_PORT
+ WAITFORIT_result=$?
+ else
+ (echo > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
+ WAITFORIT_result=$?
+ fi
+ if [[ $WAITFORIT_result -eq 0 ]]; then
+ WAITFORIT_end_ts=$(date +%s)
+ echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
+ break
+ fi
+ sleep 1
+ done
+ return $WAITFORIT_result
+}
+
+wait_for_wrapper()
+{
+ # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
+ if [[ $WAITFORIT_QUIET -eq 1 ]]; then
+ timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+ else
+ timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+ fi
+ WAITFORIT_PID=$!
+ trap "kill -INT -$WAITFORIT_PID" INT
+ wait $WAITFORIT_PID
+ WAITFORIT_RESULT=$?
+ if [[ $WAITFORIT_RESULT -ne 0 ]]; then
+ echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+ fi
+ return $WAITFORIT_RESULT
+}
+
+# process arguments
+while [[ $# -gt 0 ]]
+do
+ case "$1" in
+ *:* )
+ WAITFORIT_hostport=(${1//:/ })
+ WAITFORIT_HOST=${WAITFORIT_hostport[0]}
+ WAITFORIT_PORT=${WAITFORIT_hostport[1]}
+ shift 1
+ ;;
+ --child)
+ WAITFORIT_CHILD=1
+ shift 1
+ ;;
+ -q | --quiet)
+ WAITFORIT_QUIET=1
+ shift 1
+ ;;
+ -s | --strict)
+ WAITFORIT_STRICT=1
+ shift 1
+ ;;
+ -h)
+ WAITFORIT_HOST="$2"
+ if [[ $WAITFORIT_HOST == "" ]]; then break; fi
+ shift 2
+ ;;
+ --host=*)
+ WAITFORIT_HOST="${1#*=}"
+ shift 1
+ ;;
+ -p)
+ WAITFORIT_PORT="$2"
+ if [[ $WAITFORIT_PORT == "" ]]; then break; fi
+ shift 2
+ ;;
+ --port=*)
+ WAITFORIT_PORT="${1#*=}"
+ shift 1
+ ;;
+ -t)
+ WAITFORIT_TIMEOUT="$2"
+ if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
+ shift 2
+ ;;
+ --timeout=*)
+ WAITFORIT_TIMEOUT="${1#*=}"
+ shift 1
+ ;;
+ --)
+ shift
+ WAITFORIT_CLI=("$@")
+ break
+ ;;
+ --help)
+ usage
+ ;;
+ *)
+ echoerr "Unknown argument: $1"
+ usage
+ ;;
+ esac
+done
+
+if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
+ echoerr "Error: you need to provide a host and port to test."
+ usage
+fi
+
+WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
+WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
+WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
+WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
+
+# check to see if timeout is from busybox?
+WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
+WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
+if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
+ WAITFORIT_ISBUSY=1
+ WAITFORIT_BUSYTIMEFLAG="-t"
+
+else
+ WAITFORIT_ISBUSY=0
+ WAITFORIT_BUSYTIMEFLAG=""
+fi
+
+if [[ $WAITFORIT_CHILD -gt 0 ]]; then
+ wait_for
+ WAITFORIT_RESULT=$?
+ exit $WAITFORIT_RESULT
+else
+ if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+ wait_for_wrapper
+ WAITFORIT_RESULT=$?
+ else
+ wait_for
+ WAITFORIT_RESULT=$?
+ fi
+fi
+
+if [[ $WAITFORIT_CLI != "" ]]; then
+ if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
+ echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
+ exit $WAITFORIT_RESULT
+ fi
+ exec "${WAITFORIT_CLI[@]}"
+else
+ exit $WAITFORIT_RESULT
+fi
+
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1514ff335a99fd7f68fe500d450c8554153c5175..30c1b644a4b383ef962678ece2ea624d703a4b52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,17 +21,81 @@
#
# ** end header
#
-before_script:
- - apt-get update -qq && apt-get install -y -qq sqlite3 libsqlite3-dev nodejs
- - ruby -v
- - which ruby
- - gem install bundler --no-document
- - bundle install --jobs $(nproc) "${FLAGS[@]}"
+#before_script:
+# - apt-get update -qq && apt-get install -y -qq sqlite3 libsqlite3-dev nodejs
+# - ruby -v
+# - which ruby
+# - gem install bundler --no-document
+# - bundle install --jobs $(nproc) "${FLAGS[@]}"
+#
+#rspec:
+# script:
+# - bundle exec rspec
+#
+#rubocop:
+# script:
+# - bundle exec rubocop
+#
-rspec:
- script:
- - bundle exec rspec
+variables:
+ CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-pyint-testenv
+ # When using dind service we need to instruct docker, to talk with the
+ # daemon started inside of the service. The daemon is available with
+ # a network connection instead of the default /var/run/docker.sock socket.
+ #
+ # The 'docker' hostname is the alias of the service container as described at
+ # https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#accessing-the-services
+ #
+ # Note that if you're using the Kubernetes executor, the variable should be set to
+ # tcp://localhost:2375/ because of how the Kubernetes executor connects services
+ # to the job container
+ # DOCKER_HOST: tcp://localhost:2375/
+ #
+ # For non-Kubernetes executors, we use tcp://docker:2375/
+ DOCKER_HOST: tcp://docker:2375/
+ # When using dind, it's wise to use the overlayfs driver for
+ # improved performance.
+ DOCKER_DRIVER: overlay2
-rubocop:
+services:
+ - docker:dind
+
+stages:
+ - setup
+ - test
+
+test:
+ tags: [docker]
+ image:
+ name: docker/compose:1.24.1
+ entrypoint: ["/bin/sh", "-c"]
+ #image: $CI_REGISTRY_IMAGE:latest
script:
- - bundle exec rubocop
+ - if [[ "$CAOSDB_TAG" == "" ]]; then
+ CAOSDB_TAG=latest;
+ fi
+ - echo $CAOSDB_TAG
+ - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - cd .docker
+ - DIR=`pwd`
+ - CERTPATH=$DIR"/cert" CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d
+ - docker-compose -f tester.yml run tester
+ - rc=$?
+ - docker-compose down
+ - exit $rc
+ - cd ..
+
+build-testenv:
+ tags: [docker]
+ image: docker:latest
+ stage: setup
+ script:
+ - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ # use here general latest or specific branch latest...
+ - docker pull $CI_REGISTRY_IMAGE:latest || true
+ - docker build
+ --pull
+ --file .docker/Dockerfile
+ --cache-from $CI_REGISTRY_IMAGE:latest
+ -t $CI_REGISTRY_IMAGE:latest .
+ - docker push $CI_REGISTRY_IMAGE:latest
diff --git a/README.md b/README.md
index c2e117a5917035a5b573eea3d43f7520fab985f6..2ec3b58534c286e42aed38bad0732b5a545bb543 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[](https://gitlab.gwdg.de/bmp-caosdb/caosdb-pyinttest/commits/dev) codestyle
+
# Welcome
This is the **CaosDB Python Integration Tests** repository and a part of the
diff --git a/setup.py b/setup.py
index 9baecc3847d3cbae5211464f337541ff38ce7a9c..f673cacea5a4b27469fc59719b83bb6124a162d9 100644
--- a/setup.py
+++ b/setup.py
@@ -5,4 +5,3 @@ setup(
packages=find_packages(),
tests_require=["nose>=1.0"],
)
-
diff --git a/tests/test_tickets.py b/tests/test_tickets.py
index a03284c17cee170b6a06218fe1cdc5f17affa03f..3e0cd7219d183d29fbce598e89c117968e7f86b3 100644
--- a/tests/test_tickets.py
+++ b/tests/test_tickets.py
@@ -26,13 +26,17 @@
@author: tf
"""
from __future__ import absolute_import, print_function, unicode_literals
+
import caosdb as db
-from tests import test_misc
-from caosdb.exceptions import CaosDBException, TransactionError, EntityError, UniqueNamesError, AmbiguityException, EntityDoesNotExistError
-from nose.tools import (nottest, assert_true, assert_raises, assert_not_equals,
- assert_equals, assert_false, assert_is_not_none,
- assert_is_none)
+from caosdb.exceptions import (AmbiguityException, CaosDBException,
+ EntityDoesNotExistError, EntityError,
+ TransactionError, UniqueNamesError)
from nose import with_setup
+from nose.tools import (assert_equals, assert_false, assert_is_none,
+ assert_is_not_none, assert_raises, assert_true,
+ nottest)
+
+from tests import test_misc
def setup_module():
@@ -62,6 +66,7 @@ def test_ticket_103a():
for w in rt.get_warnings():
haswarnings = True
+
break
assert_true(haswarnings)
@@ -73,6 +78,7 @@ def test_ticket_103a():
for w in rt.get_warnings():
haswarnings = True
+
break
assert_true(haswarnings)
@@ -86,13 +92,17 @@ def test_ticket_103a():
assert_equals(128, int(exc.get_code()))
rt = exc.get_entities()[0]
assert_false(rt.is_valid())
+
for w in rt.get_warnings():
haswarnings = True
+
break
assert_true(haswarnings)
+
for w in rt.get_errors():
if w.get_code() == 128:
hasstricterror = True
+
break
assert_true(hasstricterror)
finally:
@@ -108,13 +118,17 @@ def test_ticket_103a():
try:
rt.insert(strict=True, raise_exception_on_error=False)
assert_false(rt.is_valid())
+
for w in rt.get_warnings():
haswarnings = True
+
break
assert_true(haswarnings)
+
for w in rt.get_errors():
if w.get_code() == 128:
hasstricterror = True
+
break
assert_true(hasstricterror)
finally:
@@ -323,7 +337,8 @@ def test_ticket_120():
assert_equals(r3.id, cr3.id)
cr3 = db.Query(
- "FIND RECORD WHICH HAS A PROPERTY blabla=4 OR SimpleRT1->SimpleRT2 WHICH HAS A PROPERTY SimpleRT1->" +
+ "FIND RECORD WHICH HAS A PROPERTY blabla=4 OR SimpleRT1->SimpleRT2"
+ " WHICH HAS A PROPERTY SimpleRT1->" +
str(
r1.id) +
"").execute(
@@ -336,7 +351,8 @@ def test_ticket_120():
assert_equals(r3.id, cr3.id)
cr3 = db.Query(
- "FIND RECORD SimpleRT1 . SimpleRT1.SimpleRT1.SimpleDoubleProperty='3.14'"
+ "FIND RECORD SimpleRT1 . "
+ "SimpleRT1.SimpleRT1.SimpleDoubleProperty='3.14'"
).execute(unique=True)
assert_equals(r3.id, cr3.id)
@@ -412,6 +428,7 @@ def test_ticket_106():
try:
rt = db.RecordType(name="test RT 2")
rt.insert()
+
while True:
try:
rt.insert()
@@ -419,6 +436,7 @@ def test_ticket_106():
"2nd insert should raise an TransactionError")
except db.exceptions.TransactionError as e:
print(e)
+
break
finally:
rt.delete()
@@ -608,11 +626,13 @@ def test_ticket_39():
path="testfiles/file1", from_location=testfile).insert()
except EntityError as e:
assert_equals(
- "Insufficient read permission for this file. Please make it readable.",
+ "Insufficient read permission for this file. "
+ "Please make it readable.",
e.msg)
finally:
os.chmod(testfile, 0o600)
+
if len(db.execute_query("FIND RT1")) > 0:
rt1.delete()
try:
@@ -804,6 +824,7 @@ def test_ticket_147():
r5 = db.Record().add_parent(bmsim).add_property(tstep, value="0.003")
c.extend([r1, r2, r3, r4, r5]).insert()
assert_true(c.is_valid())
+
for e in c:
assert_true(e.is_valid())
@@ -1083,6 +1104,7 @@ def test_ticket_166():
r5 = db.Record().add_parent(bmsim).add_property(tstep, value="0.003")
c.extend([r1, r2, r3, r4, r5]).insert()
assert_true(c.is_valid())
+
for e in c:
assert_true(e.is_valid())
@@ -1113,6 +1135,7 @@ def test_ticket_166():
q.putFlag("P", "0L5")
ret = q.execute()
assert_equals(5, len(ret))
+
for e in ret:
assert_equals(bmsim.id, e.get_parents()[0].id)
@@ -1120,6 +1143,7 @@ def test_ticket_166():
q.putFlag("P", "5L4")
ret = q.execute()
assert_equals(4, len(ret))
+
for e in ret:
assert_equals(frm.id, e.get_parents()[0].id)
@@ -1305,6 +1329,7 @@ def test_ticket_165():
c = db.Container().extend([p, rt_a, rt_b, r_a]).insert()
assert_true(c.is_valid())
+
for e in c:
assert_true(e.is_valid())
@@ -1438,18 +1463,22 @@ def test_ticket_174():
assert_true(c.is_valid())
assert_true(rt1.is_valid())
+
for i in range(len(rt1.get_properties())):
assert_equals(i + 1.0, float(rt1.get_properties()[i].value))
assert_true(rt2.is_valid())
+
for i in range(len(rt2.get_properties())):
assert_equals(i + 1.0, float(rt2.get_properties()[i].value))
assert_true(rt3.is_valid())
+
for i in range(len(rt3.get_properties())):
assert_equals(i + 1.0, float(rt3.get_properties()[i].value))
assert_true(rt4.is_valid())
+
for i in range(len(rt4.get_properties())):
assert_equals(i + 1.0, float(rt4.get_properties()[i].value))
diff --git a/tox.ini b/tox.ini
index f86a5ff33372612e2d65ef29aa2cc979987e4c85..b3a93ea62f2d782950af9747e9fb71863d76f2fb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,4 +4,4 @@ skip_missing_interpreters = true
[testenv]
sitepackages=true
deps=nose
-commands=nosetests -xv
+commands=nosetests -v