Skip to content

Commit 99225ad

Browse files
authored
[qa] Updated Python indentation due to black update in openwisp-utils
Triggered by openwisp/openwisp-utils#577
1 parent 6685de1 commit 99225ad

17 files changed

Lines changed: 410 additions & 820 deletions

tests/openwisp/test_backend.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,11 @@ def test_uci(self):
109109
tar = tarfile.open(fileobj=o.generate(), mode="r")
110110
system = tar.getmember("uci/system.conf")
111111
contents = tar.extractfile(system).read().decode()
112-
expected = self._tabs(
113-
"""package system
112+
expected = self._tabs("""package system
114113
115114
config 'system' 'system'
116115
option 'hostname' 'openwisp-test'
117-
"""
118-
)
116+
""")
119117
self.assertEqual(contents, expected)
120118
tar.close()
121119

tests/openwrt/test_backend.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,21 +155,18 @@ def test_generate(self):
155155
# network
156156
network = tar.getmember("etc/config/network")
157157
contents = tar.extractfile(network).read().decode()
158-
expected = self._tabs(
159-
"""config interface 'wlan0'
158+
expected = self._tabs("""config interface 'wlan0'
160159
option device 'wlan0'
161160
option ipaddr '192.168.1.1'
162161
option netmask '255.255.255.0'
163162
option proto 'static'
164163
165-
"""
166-
)
164+
""")
167165
self.assertEqual(contents, expected)
168166
# wireless
169167
wireless = tar.getmember("etc/config/wireless")
170168
contents = tar.extractfile(wireless).read().decode()
171-
expected = self._tabs(
172-
"""config wifi-device 'radio0'
169+
expected = self._tabs("""config wifi-device 'radio0'
173170
option band '2g'
174171
option channel '3'
175172
option htmode 'HT20'
@@ -184,8 +181,7 @@ def test_generate(self):
184181
option mode 'ap'
185182
option network 'wlan0'
186183
option ssid 'MyWifiAP'
187-
"""
188-
)
184+
""")
189185
self.assertEqual(contents, expected)
190186
tar.close()
191187

tests/openwrt/test_default.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ def test_render_default(self):
4747
],
4848
}
4949
)
50-
expected = self._tabs(
51-
"""package firewall
50+
expected = self._tabs("""package firewall
5251
5352
config rule 'rule_1'
5453
option family 'ipv6'
@@ -82,16 +81,14 @@ def test_render_default(self):
8281
option mediaurlbase '/luci-static/bootstrap'
8382
option number '4'
8483
option resourcebase '/luci-static/resources'
85-
"""
86-
)
84+
""")
8785
self.assertEqual(o.render(), expected)
8886
# try a second time to ensure that the usage of dict.pop
8987
# in templates does not cause any issue
9088
self.assertEqual(o.render(), expected)
9189

9290
def test_parse_default(self):
93-
native = self._tabs(
94-
"""package firewall
91+
native = self._tabs("""package firewall
9592
9693
config rule 'rule_1'
9794
option family 'ipv6'
@@ -131,8 +128,7 @@ def test_parse_default(self):
131128
132129
config custom 'custom'
133130
option test '1'
134-
"""
135-
)
131+
""")
136132
o = OpenWrt(native=native)
137133
expected = {
138134
"luci": [
@@ -240,14 +236,12 @@ def test_render_invalid_uci_name(self):
240236
],
241237
}
242238
)
243-
expected = self._tabs(
244-
"""package olsrd2
239+
expected = self._tabs("""package olsrd2
245240
246241
config olsrv2 'lan_hna'
247242
option lan '10.150.25.0/24 domain=0'
248243
249244
config olsrv2 'internet_hna'
250245
option lan '0.0.0.0/24 domain=1'
251-
"""
252-
)
246+
""")
253247
self.assertEqual(o.render(), expected)

tests/openwrt/test_encryption.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -790,17 +790,15 @@ def test_encryption_disabled(self):
790790
]
791791
}
792792
)
793-
expected = self._tabs(
794-
"""package wireless
793+
expected = self._tabs("""package wireless
795794
796795
config wifi-iface 'wifi_wlan0'
797796
option device 'radio0'
798797
option encryption 'none'
799798
option ifname 'wlan0'
800799
option mode 'ap'
801800
option ssid 'MyNetwork'
802-
"""
803-
)
801+
""")
804802
self.assertEqual(o.render(), expected)
805803

806804
_no_encryption_netjson = {

0 commit comments

Comments
 (0)