Merge ~ziyiwang/charm-bcache-tuning:fix_lint into charm-bcache-tuning:master

[Celia Wang]

Fix lint
Fix unittest after adding "writeback_rate_fp_term_factor"

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:9891e5f62f6aaa8bbd6114d5a65cf0116c200cb3
https://jenkins.canonical.com/bootstack/job/lp-charm-bcache-tuning-ci/11/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/193/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/578/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-bcache-tuning-ci/11//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:cd43d42852e3a721e98f40244225556e84f893d1
https://jenkins.canonical.com/bootstack/job/lp-charm-bcache-tuning-ci/12/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/194/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/579/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-bcache-tuning-ci/12//rebuild

review: Approve (continuous-integration)

[Xav Paice (xavpaice)]

LGTM

review: Approve

[Zachary Zehring (zzehring)]

Added 1 in-line comment regarding grammar. Once fixed, +1

review: Needs Fixing

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:345a0e6755394635237974d94f31a565ea96ab7f
https://jenkins.canonical.com/bootstack/job/lp-charm-bcache-tuning-ci/13/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/195/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/580/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-bcache-tuning-ci/13//rebuild

review: Approve (continuous-integration)

[Giuseppe Petralia (peppepetra)]

lgtm

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 11f89fe3ec804a1f1617e2b399a5f9500947f00c

diff --git a/src/reactive/bcache_tuning.py b/src/reactive/bcache_tuning.py
index 7e49940..ec090b1 100644
--- a/src/reactive/bcache_tuning.py
+++ b/src/reactive/bcache_tuning.py
@@ -71,11 +71,8 @@ def write_tuning_config():
     factor = bcache_cfg["writeback_rate_fp_term_factor"]
 
     if factor < 1:
-       log(
-           "writeback_rate_fp_term_factor should not less than 1",
-           level="WARNING"
-       )
-       factor = 1
+        log("writeback_rate_fp_term_factor should not be less than 1", level="WARNING")
+        factor = 1
 
     bcache_cfg.pop("writeback_rate_fp_term_factor")
     bcache_cfg["writeback_rate_fp_term_low"] = 1 * factor
diff --git a/src/tests/unit/test_reactive_bcache_tuning.py b/src/tests/unit/test_reactive_bcache_tuning.py
index aa5e7e8..85b2a42 100644
--- a/src/tests/unit/test_reactive_bcache_tuning.py
+++ b/src/tests/unit/test_reactive_bcache_tuning.py
@@ -30,6 +30,7 @@ class TestBcacheTuning(unittest.TestCase):
             "sequential_cutoff": 0,
             "writeback_percent": 10,
             "cache_mode": "unmanaged",
+            "writeback_rate_fp_term_factor": 1,
         }
         tune_bcache_bin = "/usr/sbin/tune-bcache"
         tuning_file_handle = mock.MagicMock()