From de7a6993e0bf9f6fba4b9717d423550454792e6b Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Thu, 19 Jul 2018 02:27:15 +0530 Subject: [PATCH] Fix build break --- bukuserver/response.py | 2 +- bukuserver/server.py | 2 +- tests/test_bukuDb.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bukuserver/response.py b/bukuserver/response.py index 98de7d4..69b8356 100644 --- a/bukuserver/response.py +++ b/bukuserver/response.py @@ -1,4 +1,4 @@ response_template = { "success": {'status': 0, 'message': 'success'}, "failure": {'status': 1, 'message': 'failure'} -} \ No newline at end of file +} diff --git a/bukuserver/server.py b/bukuserver/server.py index 8e9117f..61481ec 100644 --- a/bukuserver/server.py +++ b/bukuserver/server.py @@ -556,7 +556,7 @@ def view_statistic(): def create_app(config_filename=None): """create app.""" app = FlaskAPI(__name__) - per_page = int(os.getenv('BUKUSERVER_PER_PAGE', views.DEFAULT_PER_PAGE)) + per_page = int(os.getenv('BUKUSERVER_PER_PAGE', str(views.DEFAULT_PER_PAGE))) per_page = per_page if per_page > 0 else views.DEFAULT_PER_PAGE app.config['BUKUSERVER_PER_PAGE'] = per_page url_render_mode = os.getenv('BUKUSERVER_URL_RENDER_MODE', views.DEFAULT_URL_RENDER_MODE) diff --git a/tests/test_bukuDb.py b/tests/test_bukuDb.py index 681c878..d11507c 100644 --- a/tests/test_bukuDb.py +++ b/tests/test_bukuDb.py @@ -16,7 +16,7 @@ from tempfile import TemporaryDirectory from hypothesis import given, example from hypothesis import strategies as st -from unittest import mock as mock +from unittest import mock import pytest import unittest import yaml @@ -768,12 +768,12 @@ def test_delete_rec_range_and_delay_commit(setup, low, high, delay_commit, input n_low, n_high = normalize_range(db_len=db_len, low=low, high=high) exp_res = True - if n_high > db_len and n_low <= db_len: + if n_high > db_len >= n_low: exp_db_len = db_len - (db_len + 1 - n_low) - elif n_high == n_low and n_low > db_len: + elif n_high == n_low > db_len: exp_db_len = db_len exp_res = False - elif n_high == n_low and n_low <= db_len: + elif n_high == n_low <= db_len: exp_db_len = db_len - 1 else: exp_db_len = db_len - (n_high + 1 - n_low)