Fix for tests and updated readme

Faustasm · Faustasm · commit 75e47360e656 · 2020-11-09T20:05:32.000+02:00
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![Build Status](https://travis-ci.org/UpCloudLtd/upcloud-python-api.svg?branch=master)](https://travis-ci.org/UpCloudLtd/upcloud-python-api) [![Code Health](https://landscape.io/github/UpCloudLtd/upcloud-python-api/master/landscape.svg?style=flat)](https://landscape.io/github/UpCloudLtd/upcloud-python-api/master) [![PyPI version](https://badge.fury.io/py/upcloud-api.svg)](https://badge.fury.io/py/upcloud-api) [![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/UpCloudLtd/upcloud-python-api/blob/master/LICENSE)
 
 # UpCloud's Python API Client
-OOP-based api client for [UpCloud's API](https://www.upcloud.com/documentation/api/). Features most of the API's functionality and some convenience functions that combine several API endpoints and logic.
+OOP-based api client for [UpCloud's API](https://developers.upcloud.com/1.3/). Features most of the API's functionality and some convenience functions that combine several API endpoints and logic.
 
 NOTE: This Python client is still evolving. Please test all of your use cases thoroughly before actual production use. Using a separate UpCloud account for testing / developing the client is recommended.
 
@@ -29,15 +29,18 @@ python setup.py install
 	  (http://stackoverflow.com/questions/29099404/ssl-insecureplatform-error-when-using-requests-package)
 
 
-**Supported versions as of 0.3.3** (offline tests pass with tox):
+**Supported versions as of 0.4.6** (offline tests pass with tox):
 
 * <del>python 2.6</del> removed due to deprecation
-* python 2.7
+* python 2.7 supported but not recommended, especially when upcloud-ansible will be ported to python3
 * <del>python 3.2</del> removed due to python2/3 support
-* <del>python 3.3</del> removed due to deprecation
-* python 3.4
-* python 3.5
-* pypi3  2.4.0
+* <del>python 3.3</del> removed due to python2/3 support
+* <del>python 3.4</del> removed due to python2/3 support
+* <del>python 3.5</del> removed due to python2/3 support
+* python 3.6
+* python 3.7
+* python 3.9
+* pypi3
 
 ## Features
 * OOP based management of Servers, Storages and IP-addresses with full CRUD.
diff --git a/test/conftest.py b/test/conftest.py
@@ -39,16 +39,15 @@ def read_from_file(filename):
         return read_from_file(filename)
 
     @staticmethod
-    def mock_get(target, response_file=None, match_querystring=False):
+    def mock_get(target, response_file=None):
         if not response_file:
             response_file = target + '.json'
 
         data = Mock.read_from_file(response_file)
         responses.add(responses.GET, Mock.base_url + '/' + target,
                       body=data,
                       status=200,
-                      content_type='application/json',
-                      match_querystring=match_querystring)
+                      content_type='application/json')
         return data
 
     @staticmethod
diff --git a/test/json_data/object-storage_06b0e4fc-d74b-455e-a373-60cd6ca84022_stats_network.json b/test/json_data/object-storage_06b0e4fc-d74b-455e-a373-60cd6ca84022_stats_network.json
diff --git a/test/test_object_storage.py b/test/test_object_storage.py
@@ -58,8 +58,8 @@ def test_delete_object_storage(self, manager):
 
     @responses.activate
     def test_get_object_storage_network_statistics(self, manager):
-        data = Mock.mock_get('object-storage/06b0e4fc-d74b-455e-a373-60cd6ca84022/stats/network/?from=2020-11-03T00%3A00%3A00%2B02%3A00', match_querystring=True)
+        data = Mock.mock_get('object-storage/06b0e4fc-d74b-455e-a373-60cd6ca84022/stats/network/', response_file='object-storage_06b0e4fc-d74b-455e-a373-60cd6ca84022_stats_network.json')
         res = manager.get_object_storage_network_statistics('06b0e4fc-d74b-455e-a373-60cd6ca84022', '2020-11-03 00:00:00')
 
         assert 'stats' in res
-        assert len(res.get('stats').get('stat')) == 3  
+        assert len(res.get('stats').get('stat')) == 3
