Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -358,4 +360,5 @@ workflows:
- py36cassandra
- py37asynqp
- py37asynqp-legacy
- py38couchbase
- gevent38
3 changes: 2 additions & 1 deletion tests/clients/test_couchbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

from __future__ import absolute_import

import os
import time
import pytest
import unittest
Expand Down Expand Up @@ -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()
Expand Down
3 changes: 2 additions & 1 deletion tests/requirements-couchbase.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
couchbase==2.5.9
couchbase==2.5.9
pytest>=4.6