Compare commits
1 Commits
dev
...
4e66533cbc
Author | SHA1 | Date | |
---|---|---|---|
4e66533cbc |
@ -1,2 +0,0 @@
|
|||||||
[run]
|
|
||||||
omit=venv/*
|
|
@ -10,3 +10,4 @@ implemented interfaces / functionalities:
|
|||||||
* log
|
* log
|
||||||
* sync
|
* sync
|
||||||
|
|
||||||
|
Produced by GoldenPogácsa Inc.
|
@ -1,5 +1,6 @@
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
# Setup environment variables for testing
|
# Setup environment variables for testing
|
||||||
|
os.environ["INITIAL_SERVERS"] = "192.168.111.22"
|
||||||
os.environ["LOCAL_UUID"] = "d8b2e5e2-f675-4194-9324-af58e4b70c54"
|
os.environ["LOCAL_UUID"] = "d8b2e5e2-f675-4194-9324-af58e4b70c54"
|
||||||
os.environ["REDIS_URL"] = "redis://192.168.111.121/0"
|
os.environ["REDIS_URL"] = "redis://192.168.111.121/0"
|
||||||
|
@ -1,22 +1,21 @@
|
|||||||
import db
|
import json
|
||||||
|
import os
|
||||||
import pytest
|
import pytest
|
||||||
|
from flask import current_app
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def client(mocker):
|
def client():
|
||||||
mocker.patch("db.redis_client")
|
current_app.config['TESTING'] = True
|
||||||
db.redis_client.get.side_effect=lambda a: None
|
|
||||||
|
|
||||||
from app import app
|
with current_app.test_client() as client:
|
||||||
|
|
||||||
app.config['TESTING'] = True
|
|
||||||
|
|
||||||
with app.test_client() as client:
|
|
||||||
yield client
|
yield client
|
||||||
|
|
||||||
|
|
||||||
def test_response_length(client):
|
def test_response_length(client):
|
||||||
r = client.get('/consumers')
|
data = {
|
||||||
|
"uuid": os.environ["LOCAL_UUID"],
|
||||||
assert r.status_code == 200
|
"message": "Hello There!"
|
||||||
|
}
|
||||||
|
r = client.get('/consumers', data = json.dumps(data))
|
||||||
|
assert len(r) == 0
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
import db
|
import json
|
||||||
|
import os
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
from flask import current_app
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def client(mocker):
|
def client():
|
||||||
mocker.patch("db.redis_client")
|
current_app.config['TESTING'] = True
|
||||||
db.redis_client.get.side_effect=lambda a: None
|
|
||||||
|
|
||||||
from app import app
|
with current_app.test_client() as client:
|
||||||
|
|
||||||
app.config['TESTING'] = True
|
|
||||||
|
|
||||||
with app.test_client() as client:
|
|
||||||
yield client
|
yield client
|
||||||
|
|
||||||
|
|
||||||
@ -22,9 +22,9 @@ def test_log_code_get(client):
|
|||||||
|
|
||||||
def test_log_code_post(client):
|
def test_log_code_post(client):
|
||||||
data = {
|
data = {
|
||||||
"uuid": "asdasdasd",
|
"uuid": os.environ["LOCAL_UUID"],
|
||||||
"message": "Hello There!"
|
"message": "Hello There!"
|
||||||
}
|
}
|
||||||
r = client.post('/log', json=data)
|
r = client.post('/log', data = json.dumps(data))
|
||||||
|
|
||||||
assert r.status_code == 204
|
assert r.status_code == 204
|
||||||
|
@ -1,20 +1,19 @@
|
|||||||
import db
|
import json
|
||||||
|
import os
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
from flask import current_app
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def client(mocker):
|
def client():
|
||||||
mocker.patch("db.redis_client")
|
current_app.config['TESTING'] = True
|
||||||
db.redis_client.get.side_effect=lambda a: None
|
|
||||||
|
|
||||||
from app import app
|
with current_app.test_client() as client:
|
||||||
|
|
||||||
app.config['TESTING'] = True
|
|
||||||
|
|
||||||
with app.test_client() as client:
|
|
||||||
yield client
|
yield client
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def test_log_code_get(client):
|
def test_log_code_get(client):
|
||||||
r = client.get('/sync')
|
r = client.get('/sync')
|
||||||
|
|
||||||
@ -23,8 +22,8 @@ def test_log_code_get(client):
|
|||||||
|
|
||||||
def test_log_code_post(client):
|
def test_log_code_post(client):
|
||||||
data = {
|
data = {
|
||||||
"uuid": "tesuuid"
|
"uuid": os.environ["LOCAL_UUID"]
|
||||||
}
|
}
|
||||||
r = client.post('/sync', json=data)
|
r = client.post('/sync', data = json.dumps(data))
|
||||||
|
|
||||||
assert r.status_code == 200
|
assert r.status_code == 204
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import json
|
import json
|
||||||
|
|
||||||
from db import redis_client
|
from db import redis_client
|
||||||
from flask import jsonify
|
from flask import jsonify, request
|
||||||
from flask_classful import FlaskView
|
from flask_classful import FlaskView
|
||||||
|
|
||||||
|
|
||||||
|
@ -9,15 +9,7 @@ class SyncView(FlaskView):
|
|||||||
|
|
||||||
def post(self):
|
def post(self):
|
||||||
remote_uuid = request.json['uuid']
|
remote_uuid = request.json['uuid']
|
||||||
|
remote_ip = request.remote_addr
|
||||||
if 'ip' in request.json:
|
|
||||||
remote_ip = request.json['ip']
|
|
||||||
|
|
||||||
if request.remote_addr != remote_ip:
|
|
||||||
current_app.logger.debug(f"IP was overriden by the remote consumer {remote_ip} instead of {request.remote_addr}")
|
|
||||||
|
|
||||||
else:
|
|
||||||
remote_ip = request.remote_addr
|
|
||||||
|
|
||||||
cust_key = f"consumer_{remote_uuid}"
|
cust_key = f"consumer_{remote_uuid}"
|
||||||
|
|
||||||
|
@ -1,4 +0,0 @@
|
|||||||
pytest
|
|
||||||
pytest-mock
|
|
||||||
mock
|
|
||||||
coverage
|
|
Reference in New Issue
Block a user