Skip to content

Commit fa3f9f9

Browse files
author
Ritwick DSouza
committed
[raspbian] Consistency with other backends
1 parent 01264b6 commit fa3f9f9

8 files changed

Lines changed: 113 additions & 113 deletions

File tree

tests/raspbian/test_backend.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,36 +41,36 @@ def test_generate(self):
4141

4242
general = tar.getmember('/etc/hostname')
4343
contents = tar.extractfile(general).read().decode()
44-
expected = self._tabs('''test
44+
expected = self._tabs("""test
4545
46-
''')
46+
""")
4747
self.assertEqual(contents, expected)
4848

4949
interface = tar.getmember('/etc/network/interfaces')
5050
contents = tar.extractfile(interface).read().decode()
51-
expected = self._tabs('''auto eth0
51+
expected = self._tabs("""auto eth0
5252
iface eth0 inet static
5353
address 192.168.1.1
5454
netmask 255.255.255.0
5555
56-
''')
56+
""")
5757
self.assertEqual(contents, expected)
5858

5959
resolv = tar.getmember('/etc/resolv.conf')
6060
contents = tar.extractfile(resolv).read().decode()
61-
expected = self._tabs('''nameserver 10.11.12.13
61+
expected = self._tabs("""nameserver 10.11.12.13
6262
nameserver 8.8.8.8
6363
search netjson.org
6464
search openwisp.org
65-
''')
65+
""")
6666
self.assertEqual(contents, expected)
6767

6868
script = tar.getmember('/scripts/general.sh')
6969
contents = tar.extractfile(script).read().decode()
70-
expected = self._tabs('''/etc/init.d/hostname.sh start
70+
expected = self._tabs("""/etc/init.d/hostname.sh start
7171
echo "Hostname of device has been modified"
7272
73-
''')
73+
""")
7474
self.assertEqual(contents, expected)
7575

7676
def test_write(self):

tests/raspbian/test_hostapd.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def test_wpa2_personal(self):
3737
]
3838
})
3939

40-
expected = '''# config: /etc/hostapd/hostapd.conf
40+
expected = """# config: /etc/hostapd/hostapd.conf
4141
4242
interface=wlan0
4343
driver=nl80211
@@ -64,7 +64,7 @@ def test_wpa2_personal(self):
6464
sudo iptables -A FORWARD -i wlan0 -o eth0 -j ACCEPT
6565
sudo sh -c "iptables-save > /etc/iptables.ipv4.nat"
6666
67-
'''
67+
"""
6868
self.assertEqual(o.render(), expected)
6969

7070
def test_wpa_personal(self):
@@ -98,7 +98,7 @@ def test_wpa_personal(self):
9898
]
9999
})
100100

101-
expected = '''# config: /etc/hostapd/hostapd.conf
101+
expected = """# config: /etc/hostapd/hostapd.conf
102102
103103
interface=wlan0
104104
driver=nl80211
@@ -124,7 +124,7 @@ def test_wpa_personal(self):
124124
sudo iptables -A FORWARD -i wlan0 -o eth0 -j ACCEPT
125125
sudo sh -c "iptables-save > /etc/iptables.ipv4.nat"
126126
127-
'''
127+
"""
128128
self.assertEqual(o.render(), expected)
129129

130130
def test_wpa2_enterprise_ap(self):
@@ -158,7 +158,7 @@ def test_wpa2_enterprise_ap(self):
158158
]
159159
})
160160

161-
expected = '''# config: /etc/hostapd/hostapd.conf
161+
expected = """# config: /etc/hostapd/hostapd.conf
162162
163163
interface=wlan0
164164
driver=nl80211
@@ -189,7 +189,7 @@ def test_wpa2_enterprise_ap(self):
189189
sudo iptables -A FORWARD -i wlan0 -o eth0 -j ACCEPT
190190
sudo sh -c "iptables-save > /etc/iptables.ipv4.nat"
191191
192-
'''
192+
"""
193193

194194
self.assertEqual(o.render(), expected)
195195

@@ -223,7 +223,7 @@ def test_wep_open(self):
223223
]
224224
})
225225

226-
expected = '''# config: /etc/hostapd/hostapd.conf
226+
expected = """# config: /etc/hostapd/hostapd.conf
227227
228228
interface=wlan0
229229
driver=nl80211
@@ -248,7 +248,7 @@ def test_wep_open(self):
248248
sudo iptables -A FORWARD -i wlan0 -o eth0 -j ACCEPT
249249
sudo sh -c "iptables-save > /etc/iptables.ipv4.nat"
250250
251-
'''
251+
"""
252252
self.assertEqual(o.render(), expected)
253253

254254
def test_wep_shared(self):
@@ -281,7 +281,7 @@ def test_wep_shared(self):
281281
]
282282
})
283283

284-
expected = '''# config: /etc/hostapd/hostapd.conf
284+
expected = """# config: /etc/hostapd/hostapd.conf
285285
286286
interface=wlan0
287287
driver=nl80211
@@ -306,7 +306,7 @@ def test_wep_shared(self):
306306
sudo iptables -A FORWARD -i wlan0 -o eth0 -j ACCEPT
307307
sudo sh -c "iptables-save > /etc/iptables.ipv4.nat"
308308
309-
'''
309+
"""
310310
self.assertEqual(o.render(), expected)
311311

312312
def test_encryption_disabled(self):
@@ -341,7 +341,7 @@ def test_encryption_disabled(self):
341341
]
342342
})
343343

344-
expected = '''# config: /etc/hostapd/hostapd.conf
344+
expected = """# config: /etc/hostapd/hostapd.conf
345345
346346
interface=wlan0
347347
driver=nl80211
@@ -363,7 +363,7 @@ def test_encryption_disabled(self):
363363
sudo iptables -A FORWARD -i wlan0 -o eth0 -j ACCEPT
364364
sudo sh -c "iptables-save > /etc/iptables.ipv4.nat"
365365
366-
'''
366+
"""
367367
self.assertEqual(o.render(), expected)
368368

369369
def test_no_encryption(self):
@@ -393,7 +393,7 @@ def test_no_encryption(self):
393393
]
394394
})
395395

396-
expected = '''# config: /etc/hostapd/hostapd.conf
396+
expected = """# config: /etc/hostapd/hostapd.conf
397397
398398
interface=wlan0
399399
driver=nl80211
@@ -415,7 +415,7 @@ def test_no_encryption(self):
415415
sudo iptables -A FORWARD -i wlan0 -o eth0 -j ACCEPT
416416
sudo sh -c "iptables-save > /etc/iptables.ipv4.nat"
417417
418-
'''
418+
"""
419419
self.assertEqual(o.render(), expected)
420420

421421
def test_macaddracl_accept(self):
@@ -449,7 +449,7 @@ def test_macaddracl_accept(self):
449449
]
450450
})
451451

452-
expected = '''# config: /etc/hostapd/hostapd.conf
452+
expected = """# config: /etc/hostapd/hostapd.conf
453453
454454
interface=wlan0
455455
driver=nl80211
@@ -478,7 +478,7 @@ def test_macaddracl_accept(self):
478478
sudo iptables -A FORWARD -i wlan0 -o eth0 -j ACCEPT
479479
sudo sh -c "iptables-save > /etc/iptables.ipv4.nat"
480480
481-
'''
481+
"""
482482
self.assertEqual(o.render(), expected)
483483

484484
def test_macaddracl_deny(self):
@@ -512,7 +512,7 @@ def test_macaddracl_deny(self):
512512
]
513513
})
514514

515-
expected = '''# config: /etc/hostapd/hostapd.conf
515+
expected = """# config: /etc/hostapd/hostapd.conf
516516
517517
interface=wlan0
518518
driver=nl80211
@@ -541,5 +541,5 @@ def test_macaddracl_deny(self):
541541
sudo iptables -A FORWARD -i wlan0 -o eth0 -j ACCEPT
542542
sudo sh -c "iptables-save > /etc/iptables.ipv4.nat"
543543
544-
'''
544+
"""
545545
self.assertEqual(o.render(), expected)

0 commit comments

Comments
 (0)