From 837393cd3b2008a7aed6cc10c2cd21d9a5297969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ferenc=20G=C3=A9czi?= <ferenc.geczi@ibm.com>
Date: Tue, 22 Mar 2022 00:00:00 +0000
Subject: [PATCH] fix(test/ci): Resurrect couchbase test

---
 .circleci/config.yml             | 13 ++++++++-----
 tests/clients/test_couchbase.py  |  3 ++-
 tests/requirements-couchbase.txt |  3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 15626d4f..91169172 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,12 +46,14 @@ commands:
     steps:
       - run:
           name: Install Couchbase Dependencies
+          # Even if we use focal, we need to add the bionic repo
+          # See: https://forums.couchbase.com/
+          # t/installing-libcouchbase-dev-on-ubuntu-20-focal-fossa/25955/3
           command: |
-            sudo apt-get update
-            sudo apt install lsb-release -y
-            curl -O https://packages.couchbase.com/releases/couchbase-release/couchbase-release-1.0-6-amd64.deb
-            sudo dpkg -i ./couchbase-release-1.0-6-amd64.deb
-            sudo apt-get update
+            sudo apt update
+            sudo wget -O - http://packages.couchbase.com/ubuntu/couchbase.key | sudo apt-key add -
+            echo "deb http://packages.couchbase.com/ubuntu bionic bionic/main" | sudo tee /etc/apt/sources.list.d/couchbase.list
+            sudo apt update
             sudo apt install libcouchbase-dev -y
 
 jobs:
@@ -358,4 +360,5 @@ workflows:
       - py36cassandra
       - py37asynqp
       - py37asynqp-legacy
+      - py38couchbase
       - gevent38
diff --git a/tests/clients/test_couchbase.py b/tests/clients/test_couchbase.py
index 6b3026b9..e8e72279 100644
--- a/tests/clients/test_couchbase.py
+++ b/tests/clients/test_couchbase.py
@@ -3,6 +3,7 @@
 
 from __future__ import absolute_import
 
+import os
 import time
 import pytest
 import unittest
@@ -37,7 +38,7 @@ def setup_class(self):
         self.bucket = Bucket('couchbase://%s/travel-sample' % testenv['couchdb_host'],
                              username=testenv['couchdb_username'], password=testenv['couchdb_password'])
 
-    def setup_method(self):
+    def setup_method(self, _):
         self.bucket.upsert('test-key', 1)
         time.sleep(0.5)
         self.recorder.clear_spans()
diff --git a/tests/requirements-couchbase.txt b/tests/requirements-couchbase.txt
index b8eaae43..e433ee41 100644
--- a/tests/requirements-couchbase.txt
+++ b/tests/requirements-couchbase.txt
@@ -1 +1,2 @@
-couchbase==2.5.9
\ No newline at end of file
+couchbase==2.5.9
+pytest>=4.6