From: Michael Fritch <mfritch@suse.com>
Date: Thu, 28 Jan 2021 03:16:05 +0000 (-0700)
Subject: mgr/cephadm: Expected 1 blank line before a nested definition (E306)
X-Git-Tag: v16.2.0~178^2~42
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9415271fc28ed50ed02fc2e613926f67573cd17d;p=ceph.git

mgr/cephadm: Expected 1 blank line before a nested definition (E306)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d76324ea38cdcf9f1dac387f60bf0bec008b3ded)
---

diff --git a/src/pybind/mgr/cephadm/tests/test_spec.py b/src/pybind/mgr/cephadm/tests/test_spec.py
index 0537778994c..5f80ddf797e 100644
--- a/src/pybind/mgr/cephadm/tests/test_spec.py
+++ b/src/pybind/mgr/cephadm/tests/test_spec.py
@@ -101,6 +101,7 @@ def test_spec_octopus(spec_json):
     # Please do not modify those JSON values.
 
     spec = ServiceSpec.from_json(spec_json)
+
     # just some verification that we can sill read old octopus specs
     def convert_to_old_style_json(j):
         j_c = dict(j.copy())
@@ -121,6 +122,7 @@ def test_spec_octopus(spec_json):
         j_c.pop('objectstore', None)
         j_c.pop('filter_logic', None)
         return j_c
+
     assert spec_json == convert_to_old_style_json(spec.to_json())
 
 
diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index 41d14b54c73..b70cc7a9e7e 100644
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -11,7 +11,6 @@ requires = cython
 [flake8]
 max-line-length = 100
 ignore =
-    E306,
     E501,
     E703,
     E704,