Merge 2698fb4 into 977e5cc

.gitlab-ci.yml

@@ -11,7 +11,7 @@ stages:
     echo -e "FROM ${DOCKER_IMAGE}\nCOPY . /code" > Dockerfile.tmp
 
     if [ "${START_INTEGRATION_SERVERS}" = 'yes' ]; then
-      CID_IMAPSERVER=$(docker run -d -p 143 -p 993 -p 6379 -v /dev/random:/dev/random bechtoldt/tabellarius_tests-docker)
+      CID_IMAPSERVER=$(docker run -d -p 143 -p 993 -p 6379 -v /dev/random:/dev/random:ro bechtoldt/tabellarius_tests-docker)
       INTEGRATION_ADDR_IMAPSERVER=$(docker inspect -f '{{ .NetworkSettings.IPAddress }}' ${CID_IMAPSERVER})
       echo -e "\nENV INTEGRATION_ADDR_IMAPSERVER=${INTEGRATION_ADDR_IMAPSERVER}" >> Dockerfile.tmp
     fi

.travis.yml

@@ -37,7 +37,7 @@ install:
 script:
   - |
     if [ "${START_INTEGRATION_SERVERS}" = 'yes' ]; then
-      CID_IMAPSERVER=$(docker run -d -p 10143:143 -p 10993:993 -p 6379:6379 -v /dev/random:/dev/random bechtoldt/tabellarius_tests-docker)
+      CID_IMAPSERVER=$(docker run -d -p 10143:143 -p 10993:993 -p 6379:6379 -v /dev/random:/dev/random:ro bechtoldt/tabellarius_tests-docker)
       export INTEGRATION_PORT_IMAP=10143
       export INTEGRATION_PORT_IMAPS=10993
       export INTEGRATION_ADDR_IMAPSERVER=127.0.0.1

README.rst

@@ -58,6 +58,15 @@ Testing
 
 Integration tests require a running Docker daemon with Internet connection. The `container image <https://hub.docker.com/r/bechtoldt/tabellarius_tests-docker/>`_ that is beeing downloaded contains Dovecot and Redis.
 
+Start the Docker container:
+
+::
+
+    $ docker run -d -p 10143:143 -p 10993:993 -p 6379:6379 -v /dev/random:/dev/random:ro bechtoldt/tabellarius_tests-docker
+    $ export INTEGRATION_PORT_IMAP=10143 INTEGRATION_PORT_IMAPS=10993 INTEGRATION_ADDR_IMAPSERVER=$(docker-machine ip docker-dev)
+
+Notice: I'm gathering the IP addr via docker-machine, your own process may vary.
+
 Run integration tests:
 
 ::

tabellarius/misc.py

@@ -31,7 +31,7 @@ def parse_directory(self):
             for file_name in files:
                 file_path = '{0}/{1}'.format(dirname, file_name)
                 if file_name.endswith('.yaml'):
-                    with open(file_path, 'r') as stream:
+                    with open(file_path, 'rb') as stream:
                         data = yaml.load(stream)
                     if data:
                         for root, value in data.items():

tests/integration/test_imap.py

@@ -65,14 +65,15 @@ def test_connect_imaps(self):
 
     def test_connect_error_refused(self):
         username, password = self.create_imap_user()
-        self.assertEqual(imap.IMAP(logger=self.logger,
-                                   server=self.INTEGRATION_ADDR_IMAPSERVER,
-                                   port=1337,
-                                   starttls=False,
-                                   imaps=True,
-                                   tlsverify=False,  # TODO test tls verification?
-                                   username=username,
-                                   password=password).connect(), (False, '[Errno 111] Connection refused'))
+        self.assertIn(imap.IMAP(logger=self.logger,
+                                server=self.INTEGRATION_ADDR_IMAPSERVER,
+                                port=1337,
+                                starttls=False,
+                                imaps=True,
+                                tlsverify=False,  # TODO test tls verification?
+                                username=username,
+                                password=password).connect(), [(False, '[Errno 111] Connection refused'),
+                                                               (False, '[Errno 61] Connection refused')])
 
     def test_process_error(self):
         try: