Merge pull request #384 from cloudant/travis-python-3.6-couchdb-1.7.1

Updated Travis to run against CouchDB 1.7.1 and Python 3.6

Author: emlaver

.travis.yml

@@ -4,18 +4,20 @@ language: python
 
 python:
   - "2.7"
-  - "3.5"
+  - "3.6"
 
 env:
-  - ADMIN_PARTY=true
-  - ADMIN_PARTY=false
+  - ADMIN_PARTY=true COUCHDB_VERSION=2.1.1
+  - ADMIN_PARTY=false COUCHDB_VERSION=2.1.1
+  - ADMIN_PARTY=true COUCHDB_VERSION=1.7.1
+  - ADMIN_PARTY=false COUCHDB_VERSION=1.7.1
 
 services:
   - docker
 
 before_install:
-  - docker pull apache/couchdb:2.1.1
-  - docker run -d -it -p 5984:5984 apache/couchdb:2.1.1 --with-admin-party-please --with-haproxy
+  - docker pull apache/couchdb:$COUCHDB_VERSION
+  - docker run -d -p 5984:5984 apache/couchdb:$COUCHDB_VERSION
 
 install: "pip install -r requirements.txt && pip install -r test-requirements.txt"
 

CHANGES.md

@@ -4,7 +4,7 @@
 - [NEW] Moved `create_query_index` and other query related methods to `CouchDatabase` as the `_index`/`_find` API is available in CouchDB 2.x.
 - [NEW] Support IAM authentication in replication documents.
 - [IMPROVED] Added support for IAM API key in `cloudant_bluemix` method.
-- [IMPROVED] Updated Travis CI and unit tests to run against CouchDB 2.1.1.
+- [IMPROVED] Verified library operation on Python 3.6.3.
 - [IMPROVED] Shortened length of client URLs by removing username and password.
 
 # 2.8.1 (2018-02-16)

tests/unit/changes_tests.py

@@ -100,7 +100,11 @@ def test_get_raw_content(self):
             self.assertIsInstance(raw_line, BYTETYPE)
             raw_content.append(raw_line)
         changes = json.loads(''.join([unicode_(x) for x in raw_content]))
-        self.assertSetEqual(set(changes.keys()), set(['results', 'last_seq', 'pending']))
+        if self.is_couchdb_1x_version() is True:
+            self.assertSetEqual(
+                set(changes.keys()), set(['results', 'last_seq']))
+        else:
+            self.assertSetEqual(set(changes.keys()), set(['results', 'last_seq', 'pending']))
         results = list()
         for result in changes['results']:
             self.assertSetEqual(set(result.keys()), set(['seq', 'changes', 'id']))
@@ -230,13 +234,16 @@ def test_get_feed_descending(self):
         last_seq = None
         for change in feed:
             if last_seq:
-                current = int(change['seq'][0: change['seq'].find('-')])
-                last = int(last_seq[0:last_seq.find('-')])
-                try:
-                    self.assertTrue(current < last)
-                except AssertionError:
-                    self.assertEqual(current, last)
-                    self.assertTrue(len(change['seq']) > len(last_seq))
+                if self.is_couchdb_1x_version() is True:
+                    self.assertTrue(change['seq'] < last_seq)
+                else:
+                    current = int(change['seq'][0: change['seq'].find('-')])
+                    last = int(last_seq[0:last_seq.find('-')])
+                    try:
+                        self.assertTrue(current < last)
+                    except AssertionError:
+                        self.assertEqual(current, last)
+                        self.assertTrue(len(change['seq']) > len(last_seq))
             seq_list.append(change['seq'])
             last_seq = change['seq']
         self.assertEqual(len(seq_list), 50)

tests/unit/database_tests.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2015 IBM. All rights reserved.
+# Copyright (C) 2015, 2018 IBM Corp. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -968,6 +968,10 @@ def test_database_request_fails_after_client_disconnects(self):
         finally:
             self.client.connect()
 
+    @unittest.skipIf(not os.environ.get('RUN_CLOUDANT_TESTS') or
+                     (os.environ.get('COUCHDB_VERSION') and
+                     os.environ.get('COUCHDB_VERSION').startswith('1')),
+                     'Skipping test_create_json_index test')
     def test_create_json_index(self):
         """
         Ensure that a JSON index is created as expected.
@@ -991,6 +995,10 @@ def test_create_json_index(self):
         self.assertEquals(index['options']['def']['fields'], ['name', 'age'])
         self.assertEquals(index['reduce'], '_count')
 
+    @unittest.skipIf(not os.environ.get('RUN_CLOUDANT_TESTS') or
+                     (os.environ.get('COUCHDB_VERSION') and
+                      os.environ.get('COUCHDB_VERSION').startswith('1')),
+                     'Skipping test_create_json_index test')
     def test_delete_json_index(self):
         """
         Ensure that a JSON index is deleted as expected.

tests/unit/db_updates_tests.py

@@ -28,6 +28,7 @@
 from .unit_t_db_base import UnitTestDbBase
 from .. import BYTETYPE
 
+
 class DbUpdatesTestsBase(UnitTestDbBase):
     """
     Common _db_updates tests methods
@@ -41,8 +42,9 @@ def setUp(self):
         self.client.connect()
         self.db_names = list()
         self.new_dbs = list()
-        self.create_db_updates()
-        self.create_dbs()
+        if not self.is_couchdb_1x_version():
+            self.create_db_updates()
+            self.create_dbs()
 
     def tearDown(self):
         """
@@ -52,43 +54,55 @@ def tearDown(self):
         changes = list()
         [db.delete() for db in self.new_dbs]
         # Check the changes in the _db_updates feed to assert that the test databases are deleted
-        while not test_dbs_deleted:
-            feed = Feed(self.client, timeout=1000)
-            for change in feed:
-                if change['db_name'] in self.db_names and change['type'] == 'deleted':
-                    changes.append(change)
-                if len(changes) == 2:
-                    test_dbs_deleted = True
-                    feed.stop()
-        self.delete_db_updates()
+        if not self.is_couchdb_1x_version():
+            while not test_dbs_deleted and not self.is_couchdb_1x_version():
+                feed = Feed(self.client, timeout=1000)
+                for change in feed:
+                    if change['db_name'] in self.db_names and change['type'] == 'deleted':
+                        changes.append(change)
+                    if len(changes) == 2:
+                        test_dbs_deleted = True
+                        feed.stop()
+            self.delete_db_updates()
         self.client.disconnect()
         super(DbUpdatesTestsBase, self).tearDown()
 
     def create_dbs(self):
-        self.db_names = [self.dbname() for x in range(2)]
-        self.new_dbs += [self.client.create_database(dbname) for dbname in self.db_names]
-        # Verify that all created databases are listed in _db_updates
-        all_dbs_exist = False
-        while not all_dbs_exist:
-            changes = list()
-            feed = Feed(self.client, timeout=1000)
-            for change in feed:
-                changes.append(change)
-                if len(changes) == 3:
-                    all_dbs_exist = True
-                    feed.stop()
+        if not self.is_couchdb_1x_version():
+            self.db_names = [self.dbname() for x in range(2)]
+            self.new_dbs += [self.client.create_database(dbname) for dbname in self.db_names]
+            # Verify that all created databases are listed in _db_updates
+            all_dbs_exist = False
+            while not all_dbs_exist:
+                changes = list()
+                feed = Feed(self.client, timeout=1000)
+                for change in feed:
+                    changes.append(change)
+                    if len(changes) == 3:
+                            all_dbs_exist = True
+                            feed.stop()
+        else:
+            self.new_dbs += [(self.client.create_database(self.dbname())) for x in range(3)]
 
     def assert_changes_in_db_updates_feed(self, changes):
         """
         Assert that databases created in setup for db_updates_tests exist when looping through _db_updates feed
         Note: During the creation of _global_changes database, a doc called '_dbs' is created and seen in _db_updates
         """
-        self.dbs = ['_dbs', self.new_dbs[0].database_name, self.new_dbs[1].database_name]
-        types = ['created', 'updated']
-        for doc in changes:
-            self.assertIsNotNone(doc['seq'])
-            self.assertTrue(doc['db_name'] in self.dbs)
-            self.assertTrue(doc['type'] in types)
+        if not self.is_couchdb_1x_version():
+            self.dbs = ['_dbs', self.new_dbs[0].database_name, self.new_dbs[1].database_name]
+            types = ['created', 'updated']
+            for doc in changes:
+                self.assertIsNotNone(doc['seq'])
+                self.assertTrue(doc['db_name'] in self.dbs)
+                self.assertTrue(doc['type'] in types)
+        else:
+            self.assertDictEqual(
+                changes[0], {'db_name': self.new_dbs[0].database_name, 'type': 'created'})
+            self.assertDictEqual(
+                changes[1], {'db_name': self.new_dbs[1].database_name, 'type': 'created'})
+            self.assertDictEqual(
+                changes[2], {'db_name': self.new_dbs[2].database_name, 'type': 'created'})
 
 @unittest.skipIf(os.environ.get('RUN_CLOUDANT_TESTS'),
     'Skipping CouchDB _db_updates feed tests')
@@ -116,9 +130,12 @@ def test_stop_iteration_of_continuous_feed_with_heartbeat(self):
         feed = Feed(self.client, feed='continuous', timeout=100)
         changes = list()
         for change in feed:
-            changes.append(change)
-            if len(changes) == 3:
-                feed.stop()
+            if not change and self.is_couchdb_1x_version():
+                self.create_dbs()
+            else:
+                changes.append(change)
+                if len(changes) == 3:
+                    feed.stop()
         self.assert_changes_in_db_updates_feed(changes)
         self.assertEqual(len(changes), 3)
 
@@ -130,9 +147,12 @@ def test_get_raw_content(self):
         raw_content = list()
         for raw_line in feed:
             self.assertIsInstance(raw_line, BYTETYPE)
-            raw_content.append(raw_line)
-            if len(raw_content) == 3:
-                feed.stop()
+            if not raw_line and self.is_couchdb_1x_version():
+                self.create_dbs()
+            else:
+                raw_content.append(raw_line)
+                if len(raw_content) == 3:
+                    feed.stop()
         changes = [json.loads(unicode_(x)) for x in raw_content]
         self.assert_changes_in_db_updates_feed(changes)
 
@@ -142,11 +162,20 @@ def test_get_longpoll_feed_as_default(self):
         """
         feed = Feed(self.client, timeout=1000)
         changes = list()
-        for change in feed:
-            self.assertIsNotNone(change)
-            changes.append(change)
-        self.assert_changes_in_db_updates_feed(changes)
-        self.assertEqual(len(changes), 3)
+        if self.is_couchdb_1x_version():
+            for change in feed:
+                self.assertIsNone(change)
+                changes.append(change)
+            self.assertEqual(len(changes), 1)
+            self.assertIsNone(changes[0])
+        else:
+            for change in feed:
+                self.assertIsNotNone(change)
+                changes.append(change)
+                if len(changes) == 3:
+                    feed.stop()
+            self.assert_changes_in_db_updates_feed(changes)
+            self.assertEqual(len(changes), 3)
 
     def test_get_longpoll_feed_explicit(self):
         """
@@ -155,11 +184,20 @@ def test_get_longpoll_feed_explicit(self):
         """
         feed = Feed(self.client, timeout=1000, feed='longpoll')
         changes = list()
-        for change in feed:
-            self.assertIsNotNone(change)
-            changes.append(change)
-        self.assert_changes_in_db_updates_feed(changes)
-        self.assertEqual(len(changes), 3)
+        if self.is_couchdb_1x_version():
+            for change in feed:
+                self.assertIsNone(change)
+                changes.append(change)
+            self.assertEqual(len(changes), 1)
+            self.assertIsNone(changes[0])
+        else:
+            for change in feed:
+                self.assertIsNotNone(change)
+                changes.append(change)
+                if len(changes) == 3:
+                    feed.stop()
+            self.assert_changes_in_db_updates_feed(changes)
+            self.assertEqual(len(changes), 3)
 
     def test_get_continuous_with_timeout(self):
         """
@@ -168,13 +206,16 @@ def test_get_continuous_with_timeout(self):
         """
         feed = Feed(self.client, feed='continuous', heartbeat=False, timeout=1000)
         changes = list()
-        for change in feed:
-            self.assertIsNotNone(change)
-            changes.append(change)
-            if len(changes) == 3:
-                feed.stop()
-        self.assert_changes_in_db_updates_feed(changes)
-        self.assertEqual(len(changes), 3)
+        if self.is_couchdb_1x_version():
+            self.assertListEqual([x for x in feed], [])
+        else:
+            for change in feed:
+                self.assertIsNotNone(change)
+                changes.append(change)
+                if len(changes) == 3:
+                    feed.stop()
+            self.assert_changes_in_db_updates_feed(changes)
+            self.assertEqual(len(changes), 3)
 
     def test_invalid_argument(self):
         """

tests/unit/document_tests.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2015 IBM. All rights reserved.
+# Copyright (C) 2015, 2018 IBM Corp. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -306,9 +306,9 @@ def test_appended_error_message_using_save_with_invalid_key(self):
         err = cm.exception
         # Should be a 400 error code, but CouchDB 1.6 issues a 500
         if err.response.status_code == 500:
-            #Check this is CouchDB 1.6
-            self.assertTrue(self.client.r_session.head(self.url).headers['Server'].find('CouchDB/1.6.') >= 0,
-                            '500 returned but was not CouchDB 1.6.x')
+            # Check this is CouchDB 1.x
+            self.assertTrue(self.client.r_session.head(self.url).headers['Server'].find('CouchDB/1.') >= 0,
+                            '500 returned but was not CouchDB 1.x')
             self.assertEqual(
                 str(err.response.reason),
                 'Internal Server Error doc_validation Bad special document member: _invalid_key'