Merge pull request 3scale-qe#118 from mganisin/various-fixes

Various fixes

Author: Marian Ganisin

pytest.ini

@@ -0,0 +1,5 @@
+[pytest]
+markers =
+    smoke: smoke
+filterwarnings =
+    ignore::urllib3.exceptions.InsecureRequestWarning

tests/integration/auth/test_app_key_authorization.py

@@ -17,7 +17,7 @@ def proxy(service, proxy):
 
 
 def test_app_key_authorization(proxy, application, ssl_verify):
-    creds = application.authobj.credentials
+    creds = application.authobj().credentials
     encoded = base64.b64encode(
         f"{creds['app_id']}:{creds['app_key']}".encode("utf-8")).decode("utf-8")
 

tests/integration/conftest.py

@@ -465,7 +465,7 @@ def account_plan(account_plans_params, api):
 def invoice(account, api):
     entity = api.invoices.create(dict(account_id=account['id']))
     yield entity
-    entity.state_update(InvoiceState.cancelled)
+    entity.state_update(InvoiceState.CANCELLED)
 
 
 @pytest.fixture(scope='module')

tests/integration/test_integration_api_client.py

@@ -6,14 +6,12 @@ def test_api_client(application, proxy):
     api_client = application.api_client()
 
     assert api_client is not None
-    assert api_client._session.verify is False
+    assert api_client.verify is False
     assert api_client.get("/get").status_code == 200
 
 
-def always_no_ssl_client(application, endpoint, verify):
-    client = HttpClient(application, endpoint, verify)
-    client._verify = False
-    return client
+def always_no_ssl_client(application, endpoint, verify, cert=None, disable_retry_status_list=()):
+    return HttpClient(application, endpoint, False, cert, disable_retry_status_list)
 
 
 def test_api_client_replacement(application, proxy):
@@ -22,5 +20,5 @@ def test_api_client_replacement(application, proxy):
     api_client = application.api_client()
 
     assert api_client is not None
-    assert api_client._session.verify is False
+    assert api_client.verify is False
     assert api_client.get("/get").status_code == 200

tests/integration/test_integration_invoices.py

@@ -8,7 +8,7 @@
 def invoice_to_update(account, api):
     entity = api.invoices.create(dict(account_id=account['id']))
     yield entity
-    entity.state_update(InvoiceState.cancelled)
+    entity.state_update(InvoiceState.CANCELLED)
 
 
 def test_invoice_create(invoice):
@@ -49,15 +49,15 @@ def test_invoice_read_by_account(api, account, invoice):
 
 def test_invoice_update_state(invoice_to_update, api):
     assert invoice_to_update['state'] == 'open'
-    update = api.invoices.state_update(invoice_to_update.entity_id, InvoiceState.pending)
+    update = api.invoices.state_update(invoice_to_update.entity_id, InvoiceState.PENDING)
     assert update['state'] == 'pending'
     read = api.invoices.read(invoice_to_update.entity_id)
     assert read['state'] == 'pending'
 
 
 def test_invoice_resource_update_state(invoice_to_update, api):
     assert invoice_to_update['state'] == 'open'
-    update = invoice_to_update.state_update(InvoiceState.pending)
+    update = invoice_to_update.state_update(InvoiceState.PENDING)
     assert update['state'] == 'pending'
     read = api.invoices.read(invoice_to_update.entity_id)
     assert read['state'] == 'pending'