Skip to content

Commit 9e1958f

Browse files
edoputedoput
committed
[airos] retabbed test code to use 4 spaces
1 parent 480e8fc commit 9e1958f

16 files changed

Lines changed: 568 additions & 668 deletions

‎tests/airos/mock.py‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class AaaAirOs(AirOs):
3838
Mock backend with converter for radius authentication
3939
"""
4040
converters = [
41-
Aaa,
41+
Aaa,
4242
]
4343

4444

@@ -47,7 +47,7 @@ class BridgeAirOs(AirOs):
4747
Mock backend with converter for bridge interface
4848
"""
4949
converters = [
50-
Bridge,
50+
Bridge,
5151
]
5252

5353

@@ -56,7 +56,7 @@ class DiscoveryAirOs(AirOs):
5656
Mock backend with converter for network hardware discovery
5757
"""
5858
converters = [
59-
Discovery,
59+
Discovery,
6060
]
6161

6262

@@ -65,7 +65,7 @@ class DyndnsAirOs(AirOs):
6565
Mock backend with converter for dynamic dns capabilities
6666
"""
6767
converters = [
68-
Dyndns,
68+
Dyndns,
6969
]
7070

7171

@@ -74,7 +74,7 @@ class EbtablesAirOs(AirOs):
7474
Mock backend with converter for ebtables
7575
"""
7676
converters = [
77-
Ebtables,
77+
Ebtables,
7878
]
7979

8080

@@ -83,7 +83,7 @@ class GuiAirOs(AirOs):
8383
Mock backend with converter for web interface settings
8484
"""
8585
converters = [
86-
Gui,
86+
Gui,
8787
]
8888

8989

@@ -92,7 +92,7 @@ class HttpdAirOs(AirOs):
9292
Mock backend with converter for web server
9393
"""
9494
converters = [
95-
Httpd,
95+
Httpd,
9696
]
9797

9898

@@ -101,7 +101,7 @@ class Igmpproxy(AirOs):
101101
Mock backend with converter for igmpproxy
102102
"""
103103
converters = [
104-
Igmpproxy,
104+
Igmpproxy,
105105
]
106106

107107

@@ -110,7 +110,7 @@ class IptablesAirOs(AirOs):
110110
Mock backend with converter for iptables
111111
"""
112112
converters = [
113-
Iptables,
113+
Iptables,
114114
]
115115

116116

@@ -119,7 +119,7 @@ class NetconfAirOs(AirOs):
119119
Mock backend with converter for network configuration
120120
"""
121121
converters = [
122-
Netconf,
122+
Netconf,
123123
]
124124

125125

@@ -128,7 +128,7 @@ class NetmodeAirOs(AirOs):
128128
Mock backend with converter for network mode
129129
"""
130130
converters = [
131-
Netmode,
131+
Netmode,
132132
]
133133

134134

@@ -137,7 +137,7 @@ class NtpclientAirOs(AirOs):
137137
Mock backend with converter for ntp settings
138138
"""
139139
converters = [
140-
Ntpclient,
140+
Ntpclient,
141141
]
142142

143143

@@ -146,7 +146,7 @@ class PwdogAirOs(AirOs):
146146
Mock backend with converter for ping watchdog settings
147147
"""
148148
converters = [
149-
Pwdog,
149+
Pwdog,
150150
]
151151

152152

@@ -155,7 +155,7 @@ class RadioAirOs(AirOs):
155155
Mock backend with converter for radio settings
156156
"""
157157
converters = [
158-
Radio,
158+
Radio,
159159
]
160160

161161

@@ -164,7 +164,7 @@ class ResolvAirOs(AirOs):
164164
Mock backend with converter for network resolver
165165
"""
166166
converters = [
167-
Resolv,
167+
Resolv,
168168
]
169169

170170

@@ -173,7 +173,7 @@ class RouteAirOs(AirOs):
173173
Mock backend with converter for static routes
174174
"""
175175
converters = [
176-
Route,
176+
Route,
177177
]
178178

179179

@@ -182,7 +182,7 @@ class SnmpAirOs(AirOs):
182182
Mock backend with converter for simple network management protocol
183183
"""
184184
converters = [
185-
Snmp,
185+
Snmp,
186186
]
187187

188188

@@ -191,7 +191,7 @@ class SshdAirOs(AirOs):
191191
Mock backend with converter for ssh daemon settings
192192
"""
193193
converters = [
194-
Sshd,
194+
Sshd,
195195
]
196196

197197

@@ -200,7 +200,7 @@ class SyslogAirOs(AirOs):
200200
Mock backend with converter for remote logging
201201
"""
202202
converters = [
203-
Syslog,
203+
Syslog,
204204
]
205205

206206

@@ -209,7 +209,7 @@ class SystemAirOs(AirOs):
209209
Mock backend with converter for system settings
210210
"""
211211
converters = [
212-
System,
212+
System,
213213
]
214214

215215

@@ -218,7 +218,7 @@ class TelnetdAirOs(AirOs):
218218
Mock backend with converter for telnet daemon settings
219219
"""
220220
converters = [
221-
Telnetd,
221+
Telnetd,
222222
]
223223

224224

@@ -227,7 +227,7 @@ class UpdateAirOs(AirOs):
227227
Mock backend with converter for update
228228
"""
229229
converters = [
230-
Update,
230+
Update,
231231
]
232232

233233

@@ -236,7 +236,7 @@ class UsersAirOs(AirOs):
236236
Mock backend with converter for users settings
237237
"""
238238
converters = [
239-
Users,
239+
Users,
240240
]
241241

242242

@@ -245,7 +245,7 @@ class VlanAirOs(AirOs):
245245
Mock backend with converter for vlan settings
246246
"""
247247
converters = [
248-
Vlan,
248+
Vlan,
249249
]
250250

251251

@@ -254,7 +254,7 @@ class WirelessAirOs(AirOs):
254254
Mock backend with converter for wireless settings
255255
"""
256256
converters = [
257-
Wireless,
257+
Wireless,
258258
]
259259

260260

@@ -263,5 +263,5 @@ class WpasupplicantAirOs(AirOs):
263263
Mock backend with converter for wpasupplicant settings
264264
"""
265265
converters = [
266-
Wpasupplicant,
266+
Wpasupplicant,
267267
]

‎tests/airos/test_aaa.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ def test_aaa_key(self):
1010
"general": {},
1111
"interfaces": [],
1212
})
13-
1413
o.to_intermediate()
15-
1614
expected = [
1715
{
1816
'status': 'disabled',

‎tests/airos/test_bridge.py‎

Lines changed: 56 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,22 @@ def test_active_bridge(self):
3232
}
3333
]
3434
})
35-
3635
o.to_intermediate()
37-
3836
expected = [
39-
{
40-
'1.comment': '',
41-
'1.devname': 'br0',
42-
'1.port.1.devname': 'eth0',
43-
'1.port.1.status': 'enabled',
44-
'1.port.2.devname': 'eth1',
45-
'1.port.2.status': 'enabled',
46-
'1.status': 'enabled',
47-
'1.stp.status': 'enabled'
48-
},
49-
{
50-
'status': 'enabled',
51-
}
52-
]
37+
{
38+
'1.comment': '',
39+
'1.devname': 'br0',
40+
'1.port.1.devname': 'eth0',
41+
'1.port.1.status': 'enabled',
42+
'1.port.2.devname': 'eth1',
43+
'1.port.2.status': 'enabled',
44+
'1.status': 'enabled',
45+
'1.stp.status': 'enabled'
46+
},
47+
{
48+
'status': 'enabled',
49+
}
50+
]
5351

5452
self.assertEqualConfig(o.intermediate_data['bridge'], expected)
5553

@@ -77,24 +75,22 @@ def test_disabled_bridge(self):
7775
}
7876
]
7977
})
80-
8178
o.to_intermediate()
82-
8379
expected = [
84-
{
85-
'1.comment': '',
86-
'1.devname': 'br0',
87-
'1.port.1.devname': 'eth0',
88-
'1.port.1.status': 'enabled',
89-
'1.port.2.devname': 'eth1',
90-
'1.port.2.status': 'enabled',
91-
'1.status': 'disabled',
92-
'1.stp.status': 'enabled'
93-
},
94-
{
95-
'status': 'enabled',
96-
}
97-
]
80+
{
81+
'1.comment': '',
82+
'1.devname': 'br0',
83+
'1.port.1.devname': 'eth0',
84+
'1.port.1.status': 'enabled',
85+
'1.port.2.devname': 'eth1',
86+
'1.port.2.status': 'enabled',
87+
'1.status': 'disabled',
88+
'1.stp.status': 'enabled'
89+
},
90+
{
91+
'status': 'enabled',
92+
}
93+
]
9894

9995
self.assertEqualConfig(o.intermediate_data['bridge'], expected)
10096

@@ -141,34 +137,32 @@ def test_many_bridges(self):
141137
}
142138
]
143139
})
144-
145140
o.to_intermediate()
146-
147141
expected = [
148-
{
149-
'1.comment': '',
150-
'1.devname': 'br0',
151-
'1.port.1.devname': 'eth0',
152-
'1.port.1.status': 'enabled',
153-
'1.port.2.devname': 'eth1',
154-
'1.port.2.status': 'enabled',
155-
'1.status': 'disabled',
156-
'1.stp.status': 'enabled'
157-
},
158-
{
159-
'2.comment': '',
160-
'2.devname': 'br1',
161-
'2.port.1.devname': 'eth2',
162-
'2.port.1.status': 'enabled',
163-
'2.port.2.devname': 'eth3',
164-
'2.port.2.status': 'enabled',
165-
'2.status': 'enabled',
166-
'2.stp.status': 'enabled'
167-
},
168-
{
169-
'status': 'enabled',
170-
}
171-
]
142+
{
143+
'1.comment': '',
144+
'1.devname': 'br0',
145+
'1.port.1.devname': 'eth0',
146+
'1.port.1.status': 'enabled',
147+
'1.port.2.devname': 'eth1',
148+
'1.port.2.status': 'enabled',
149+
'1.status': 'disabled',
150+
'1.stp.status': 'enabled'
151+
},
152+
{
153+
'2.comment': '',
154+
'2.devname': 'br1',
155+
'2.port.1.devname': 'eth2',
156+
'2.port.1.status': 'enabled',
157+
'2.port.2.devname': 'eth3',
158+
'2.port.2.status': 'enabled',
159+
'2.status': 'enabled',
160+
'2.stp.status': 'enabled'
161+
},
162+
{
163+
'status': 'enabled',
164+
}
165+
]
172166

173167
self.assertEqualConfig(o.intermediate_data['bridge'], expected)
174168

@@ -187,13 +181,11 @@ def test_no_bridge(self):
187181
},
188182
]
189183
})
190-
191184
o.to_intermediate()
192-
193185
expected = [
194-
{
195-
'status': 'enabled',
196-
}
197-
]
186+
{
187+
'status': 'enabled',
188+
}
189+
]
198190

199191
self.assertEqualConfig(o.intermediate_data['bridge'], expected)

0 commit comments

Comments
 (0)