Merge remote-tracking branch 'origin/master' into client

Author: adamtheturtle

.travis.yml

@@ -1,7 +1,7 @@
-sudo: false
 language: python
-python:
-- '3.6'
+python: 3.7
+dist: xenial
+sudo: true
 addons:
   apt:
     packages:

dev-requirements.txt

@@ -1,6 +1,6 @@
 PyYAML==3.13
 Pygments==2.2.0
-VWS-Python-Mock==2018.9.10.6
+VWS-Python-Mock==2018.10.01.1
 autoflake==1.2
 check-manifest==0.37
 codecov==2.0.15 # Upload coverage data

tests/conftest.py

@@ -6,6 +6,7 @@
 
 import pytest
 from mock_vws import MockVWS
+from mock_vws.database import VuforiaDatabase
 
 from vws import VWS
 
@@ -20,9 +21,11 @@ def client() -> Iterator[VWS]:
     Yield a VWS client which connects to a mock.
     """
     with MockVWS() as mock:
+        database = VuforiaDatabase()
+        mock.add_database(database=database)
         vws_client = VWS(
-            server_access_key=mock.server_access_key,
-            server_secret_key=mock.server_secret_key,
+            server_access_key=database.server_access_key.decode(),
+            server_secret_key=database.server_secret_key.decode(),
         )
 
         yield vws_client

tests/test_exceptions.py

@@ -6,7 +6,9 @@
 import random
 
 import pytest
-from mock_vws import MockVWS, States
+from mock_vws import MockVWS
+from mock_vws.database import VuforiaDatabase
+from mock_vws.states import States
 from PIL import Image
 from requests import codes
 
@@ -97,10 +99,10 @@ def test_fail(high_quality_image: io.BytesIO) -> None:
     """
     A ``Fail`` exception is raised when there are authentication issues.
     """
-    with MockVWS() as mock:
+    with MockVWS():
         client = VWS(
             server_access_key='a',
-            server_secret_key=mock.server_secret_key,
+            server_secret_key='a',
         )
 
         with pytest.raises(Fail) as exc:
@@ -144,10 +146,12 @@ def test_project_inactive(client: VWS, high_quality_image: io.BytesIO) -> None:
     A ``ProjectInactive`` exception is raised if adding a target to an
     inactive database.
     """
-    with MockVWS(state=States.PROJECT_INACTIVE) as mock:
+    database = VuforiaDatabase(state=States.PROJECT_INACTIVE)
+    with MockVWS() as mock:
+        mock.add_database(database=database)
         client = VWS(
-            server_access_key=mock.server_access_key,
-            server_secret_key=mock.server_secret_key,
+            server_access_key=database.server_access_key.decode(),
+            server_secret_key=database.server_secret_key.decode(),
         )
 
         with pytest.raises(ProjectInactive) as exc:

tests/test_vws.py

@@ -7,6 +7,7 @@
 
 import pytest
 from mock_vws import MockVWS
+from mock_vws.database import VuforiaDatabase
 
 from vws import VWS
 from vws.exceptions import UnknownTarget
@@ -99,9 +100,11 @@ def test_custom_base_url(self, high_quality_image: io.BytesIO) -> None:
         """
         base_vws_url = 'http://example.com'
         with MockVWS(base_vws_url=base_vws_url) as mock:
+            database = VuforiaDatabase()
+            mock.add_database(database=database)
             client = VWS(
-                server_access_key=mock.server_access_key,
-                server_secret_key=mock.server_secret_key,
+                server_access_key=database.server_access_key.decode(),
+                server_secret_key=database.server_secret_key.decode(),
                 base_vws_url=base_vws_url,
             )