From c3cb713ae76528eeeaaeb948fe319a76ab3934d8 Mon Sep 17 00:00:00 2001
From: Olivier Mangin <olivier@mangin.com>
Date: Thu, 28 Feb 2019 22:51:27 -0800
Subject: [PATCH 1/3] Fix test broken likely by pyyaml update by making it more
 explicit

- does not test a specific output from pyyaml dump anymore,
- explicitely check decode and encode-decode step.
---
 tests/test_endecoder.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/test_endecoder.py b/tests/test_endecoder.py
index 11d5306..d9ade7f 100644
--- a/tests/test_endecoder.py
+++ b/tests/test_endecoder.py
@@ -26,7 +26,7 @@ class TestEnDecode(unittest.TestCase):
     def test_decode_emptystring(self):
         decoder = endecoder.EnDecoder()
         with self.assertRaises(decoder.BibDecodingError):
-            entry = decoder.decode_bibdata('')
+            decoder.decode_bibdata('')
 
     def test_encode_bibtex_is_unicode(self):
         decoder = endecoder.EnDecoder()
@@ -117,11 +117,21 @@ class TestEnDecode(unittest.TestCase):
         self.assertIn('keyword', entry)
         self.assertEqual(set(keywords), set(entry['keyword']))
 
+    def test_decode_metadata(self):
+        decoder = endecoder.EnDecoder()
+        entry = decoder.decode_metadata(metadata_raw0)
+        expected = {'docfile': 'docsdir://Page99.pdf',
+                    'tags': ['search', 'network'],
+                    'added': '2013-11-14 13:14:20',
+                    }
+        self.assertEqual(entry, expected)
+
     def test_endecode_metadata(self):
         decoder = endecoder.EnDecoder()
         entry = decoder.decode_metadata(metadata_raw0)
         metadata_output0 = decoder.encode_metadata(entry)
-        self.assertEqual(set(metadata_raw0.split('\n')), set(metadata_output0.split('\n')))
+        entry_from_encode = decoder.decode_metadata(metadata_output0)
+        self.assertEqual(entry, entry_from_encode)
 
     def test_endecode_bibtex_field_order(self):
         decoder = endecoder.EnDecoder()

From 9754ed721c71ae886855799f0e28483f955935f8 Mon Sep 17 00:00:00 2001
From: Olivier Mangin <olivier@mangin.com>
Date: Thu, 28 Feb 2019 22:59:26 -0800
Subject: [PATCH 2/3] Adds missing python 3.7 tests to Travis.

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d0c8cb0..6910657 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,6 +56,14 @@ matrix:
       python: 3.6
       env:
         - TO_TEST=TEST_MOCK
+    - os: linux
+      language: python
+      dist: xenial
+      python: 3.7
+      sudo: true
+      env:
+        - TO_TEST=TEST_MOCK
+
 
     # Install tests
     - os: linux

From 7c5ec2ae1e81bab34d70701d228d58da4a37a3cc Mon Sep 17 00:00:00 2001
From: Olivier Mangin <olivier@mangin.com>
Date: Thu, 28 Feb 2019 23:01:17 -0800
Subject: [PATCH 3/3] Factors mock in travis script.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6910657..cbd0ad2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,7 +99,7 @@ matrix:
 # command to run tests
 script:
   - python --version
-  - if [ "$TO_TEST" = "TEST_FULL" ]; then PUBS_TESTS_MODE=MOCK    python setup.py test; fi
+  - if [ "$TO_TEST" = "TEST_MOCK" ] ||
+       [ "$TO_TEST" = "TEST_FULL" ]; then PUBS_TESTS_MODE=MOCK    python setup.py test; fi
   - if [ "$TO_TEST" = "TEST_FULL" ]; then PUBS_TESTS_MODE=COLLECT python setup.py test; fi
-  - if [ "$TO_TEST" = "TEST_MOCK" ]; then PUBS_TESTS_MODE=MOCK    python setup.py test; fi
   - if [ "$TO_TEST" = "INSTALL" ]; then pip install -U pip && pip install pubs && pubs --help && pip uninstall -y pubs; fi