Merge lp:~nataliabidart/magicicada-client/run-tests-travis-docker-xenial into lp:magicicada-client

[Natalia Bidart]

- Provide docker rules to be able to build a xenial image and run tests in it.
- Fix failing test for config file parsing for when LANG=C.

[Facundo Batista (facundo)]

Great!

review: Approve

=== modified file '.travis.yml'
--- .travis.yml	2016-05-31 00:15:56 +0000
+++ .travis.yml	2018-03-14 21:56:42 +0000
@@ -1,10 +1,13 @@
 sudo: required
 dist: trusty
+language: bash
+
+services:
+    - docker
 
 before_install:
-    - sudo apt-get update
-    - make clean
-    - make bootstrap
+    - docker pull ubuntu:16.04
+    - docker build -t magicicada-client-test-run .
 
 script:
-    - make test
+    - docker run magicicada-client-test-run make test

=== added file 'Dockerfile'
--- Dockerfile	1970-01-01 00:00:00 +0000
+++ Dockerfile	2018-03-14 21:56:42 +0000
@@ -0,0 +1,14 @@
+FROM ubuntu:16.04
+
+ADD . /home/ubuntu/magicicada-client
+COPY . /home/ubuntu/magicicada-client
+WORKDIR /home/ubuntu/magicicada-client
+
+RUN apt-get update && apt-get install make -y
+RUN make docker-bootstrap
+
+RUN useradd -ms /bin/bash ubuntu
+RUN chown -R ubuntu:ubuntu /home/ubuntu
+
+USER ubuntu
+ENV HOME /home/ubuntu

=== modified file 'Makefile'
--- Makefile	2016-06-03 20:05:05 +0000
+++ Makefile	2018-03-14 21:56:42 +0000
@@ -46,6 +46,11 @@
 
 bootstrap: deps $(PROTOCOL_DIR) $(PROTOCOL_LINK) update-protocol
 
+docker-bootstrap: clean
+	cat dependencies.txt | xargs apt-get install -y --no-install-recommends
+	cat dependencies-devel.txt | xargs apt-get install -y --no-install-recommends
+	$(MAKE) $(PROTOCOL_DIR) $(PROTOCOL_LINK) update-protocol
+
 lint:
 	virtualenv $(ENV)
 	$(ENV)/bin/pip install flake8

=== removed directory 'ubuntuone/platform/tests/notification'
=== modified file 'ubuntuone/syncdaemon/config.py'
--- ubuntuone/syncdaemon/config.py	2017-02-10 01:15:07 +0000
+++ ubuntuone/syncdaemon/config.py	2018-03-14 21:56:42 +0000
@@ -206,11 +206,11 @@
     config_files = []
     for xdg_config_dir in load_config_paths('ubuntuone'):
         xdg_config_dir = unicode_path(xdg_config_dir)
-        config_file = os.path.join(xdg_config_dir, CONFIG_FILE)
+        config_file = os.path.join(xdg_config_dir, CONFIG_FILE).encode('utf8')
         if os.path.exists(config_file):
             config_files.append(config_file)
 
-        config_logs = os.path.join(xdg_config_dir, CONFIG_LOGS)
+        config_logs = os.path.join(xdg_config_dir, CONFIG_LOGS).encode('utf8')
         if os.path.exists(config_logs):
             config_files.append(config_logs)
 

=== modified file 'ubuntuone/syncdaemon/tests/test_config.py'
--- ubuntuone/syncdaemon/tests/test_config.py	2017-02-10 01:15:07 +0000
+++ ubuntuone/syncdaemon/tests/test_config.py	2018-03-14 21:56:42 +0000
@@ -447,12 +447,12 @@
     def test_get_config_files_path_encoding(self):
         """Check that get_config_files uses paths in the right encoding."""
         temp = self.mktemp()
-        fake_path = os.path.join(temp, u"Ñandú")
+        fake_path = os.path.join(temp, u"Ñandú".encode("utf8"))
+        assert isinstance(fake_path, str)
         os.makedirs(fake_path)
         with open(os.path.join(fake_path, config.CONFIG_FILE), "w") as f:
             f.write("this is a fake config file")
-        self.patch(
-            config, "load_config_paths", lambda _: [fake_path.encode("utf8")])
+        self.patch(config, "load_config_paths", lambda _: [fake_path])
         config_files = config.get_config_files()
         branch_config = os.path.join(fake_path, config.CONFIG_FILE)
         self.assertIn(branch_config, config_files)