mirror of
https://github.com/gryf/wicd.git
synced 2026-02-01 13:35:48 +01:00
Style changes for python files
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
import unittest
|
||||
from wicd import misc
|
||||
|
||||
|
||||
class TestMisc(unittest.TestCase):
|
||||
def test_misc_run(self):
|
||||
output = misc.Run(['echo', 'hi']).strip()
|
||||
@@ -25,10 +26,12 @@ class TestMisc(unittest.TestCase):
|
||||
self.assertTrue(misc.IsValidIP('::1'))
|
||||
|
||||
def test_valid_ip_6(self):
|
||||
self.assertTrue(misc.IsValidIP('FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF'))
|
||||
self.assertTrue(misc.
|
||||
IsValidIP('FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF'))
|
||||
|
||||
def test_valid_ip_7(self):
|
||||
self.assertTrue(misc.IsValidIP('2001:0db8:85a3:0000:0000:8a2e:0370:7334'))
|
||||
self.assertTrue(misc.
|
||||
IsValidIP('2001:0db8:85a3:0000:0000:8a2e:0370:7334'))
|
||||
|
||||
def test_invalid_ip_1(self):
|
||||
self.assertFalse(misc.IsValidIP('-10.0.-1.-1'))
|
||||
@@ -46,10 +49,12 @@ class TestMisc(unittest.TestCase):
|
||||
self.assertFalse(misc.IsValidIP('1:'))
|
||||
|
||||
def test_invalid_ip_6(self):
|
||||
self.assertFalse(misc.IsValidIP('ZZZZ:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF'))
|
||||
self.assertFalse(misc.
|
||||
IsValidIP('ZZZZ:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF'))
|
||||
|
||||
def test_invalid_ip_7(self):
|
||||
self.assertFalse(misc.IsValidIP('2001:0db8:85Z3:0000:0000:8a2e:0370:7334'))
|
||||
self.assertFalse(misc.
|
||||
IsValidIP('2001:0db8:85Z3:0000:0000:8a2e:0370:7334'))
|
||||
|
||||
def test_run_valid_regex(self):
|
||||
import re
|
||||
@@ -72,7 +77,7 @@ class TestMisc(unittest.TestCase):
|
||||
def test_to_boolean_true(self):
|
||||
self.assertTrue(misc.to_bool('True'))
|
||||
|
||||
def test_to_boolean_true(self):
|
||||
def test_to_boolean_true_int(self):
|
||||
self.assertTrue(misc.to_bool('1'))
|
||||
|
||||
def test_noneify_1(self):
|
||||
@@ -137,7 +142,8 @@ class TestMisc(unittest.TestCase):
|
||||
self.assertEqual(misc.to_unicode('abcdef'), 'abcdef')
|
||||
|
||||
def test_to_unicode_4(self):
|
||||
self.assertEqual(type(misc.to_unicode('abcdef'.encode('latin-1'))), bytes)
|
||||
self.assertEqual(type(misc.to_unicode('abcdef'.encode('latin-1'))),
|
||||
bytes)
|
||||
|
||||
def test_to_unicode_5(self):
|
||||
self.assertEqual(misc.to_unicode("berkåk"), "berkåk")
|
||||
@@ -163,13 +169,15 @@ class TestMisc(unittest.TestCase):
|
||||
def test_string_to_none_4(self):
|
||||
self.assertEqual(misc.stringToNone('abcdef'), 'abcdef')
|
||||
|
||||
|
||||
def suite():
|
||||
suite = unittest.TestSuite()
|
||||
tests = []
|
||||
[ tests.append(test) for test in dir(TestMisc) if test.startswith('test') ]
|
||||
for test in tests:
|
||||
suite.addTest(TestMisc(test))
|
||||
return suite
|
||||
suite = unittest.TestSuite()
|
||||
tests = []
|
||||
[tests.append(test) for test in dir(TestMisc) if test.startswith('test')]
|
||||
for test in tests:
|
||||
suite.addTest(TestMisc(test))
|
||||
return suite
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
unittest.main()
|
||||
|
||||
@@ -2,71 +2,78 @@ import unittest
|
||||
from unittest import mock
|
||||
from wicd import wnettools
|
||||
|
||||
class TestWnettools(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.interface = wnettools.BaseInterface('eth0')
|
||||
|
||||
def test_find_wireless_interface(self):
|
||||
interfaces = wnettools.GetWirelessInterfaces()
|
||||
# wlan0 may change depending on your system
|
||||
#self.assertTrue('wlan0' in interfaces)
|
||||
self.assertTrue(type(interfaces) == list)
|
||||
|
||||
@mock.patch('wicd.wnettools.os')
|
||||
@mock.patch('wicd.wnettools.open')
|
||||
def test_find_wired_interface(self, mock_f, mock_os):
|
||||
mock_os.listdir.return_value = ['eth0']
|
||||
mock_os.path.isdir.return_value = True
|
||||
mock_f.return_value.readlines.return_value = "1"
|
||||
interfaces = wnettools.GetWiredInterfaces()
|
||||
self.assertTrue('eth0' in interfaces)
|
||||
|
||||
@mock.patch('wicd.misc.Run')
|
||||
def test_wext_is_valid_wpasupplicant_driver(self, mock_syscall):
|
||||
self.assertTrue(wnettools.IsValidWpaSuppDriver('wext'))
|
||||
mock_syscall.assert_called_once()
|
||||
|
||||
def test_needs_external_calls_not_implemented(self):
|
||||
self.assertRaises(NotImplementedError, wnettools.NeedsExternalCalls)
|
||||
|
||||
def test_is_up_boolean(self):
|
||||
self.assertTrue(type(self.interface.IsUp()) == bool)
|
||||
|
||||
def test_enable_debug_mode(self):
|
||||
self.interface.SetDebugMode(True)
|
||||
self.assertTrue(self.interface.verbose)
|
||||
|
||||
def test_disable_debug_mode(self):
|
||||
self.interface.SetDebugMode(False)
|
||||
self.assertFalse(self.interface.verbose)
|
||||
|
||||
def test_interface_name_sanitation(self):
|
||||
interface = wnettools.BaseInterface('blahblah; uptime > /tmp/blah | cat')
|
||||
self.assertEqual(interface.iface, 'blahblahuptimetmpblahcat')
|
||||
|
||||
def test_freq_translation_low(self):
|
||||
freq = '2.412 GHz'
|
||||
interface = wnettools.BaseWirelessInterface('wlan0')
|
||||
self.assertEqual(interface._FreqToChannel(freq), 1)
|
||||
|
||||
def test_freq_translation_high(self):
|
||||
freq = '2.484 GHz'
|
||||
interface = wnettools.BaseWirelessInterface('wlan0')
|
||||
self.assertEqual(interface._FreqToChannel(freq), 14)
|
||||
|
||||
def test_generate_psk(self):
|
||||
interface = wnettools.BaseWirelessInterface('wlan0')
|
||||
if 'wlan0' in wnettools.GetWirelessInterfaces():
|
||||
psk = interface.GeneratePSK({'essid' : 'Network 1', 'key' : 'arandompassphrase'})
|
||||
self.assertEqual(psk, 'd70463014514f4b4ebb8e3aebbdec13f4437ac3a9af084b3433f3710e658a7be')
|
||||
class TestWnettools(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.interface = wnettools.BaseInterface('eth0')
|
||||
|
||||
def test_find_wireless_interface(self):
|
||||
interfaces = wnettools.GetWirelessInterfaces()
|
||||
# wlan0 may change depending on your system
|
||||
# self.assertTrue('wlan0' in interfaces)
|
||||
self.assertTrue(type(interfaces) == list)
|
||||
|
||||
@mock.patch('wicd.wnettools.os')
|
||||
@mock.patch('wicd.wnettools.open')
|
||||
def test_find_wired_interface(self, mock_f, mock_os):
|
||||
mock_os.listdir.return_value = ['eth0']
|
||||
mock_os.path.isdir.return_value = True
|
||||
mock_f.return_value.readlines.return_value = "1"
|
||||
interfaces = wnettools.GetWiredInterfaces()
|
||||
self.assertTrue('eth0' in interfaces)
|
||||
|
||||
@mock.patch('wicd.misc.Run')
|
||||
def test_wext_is_valid_wpasupplicant_driver(self, mock_syscall):
|
||||
self.assertTrue(wnettools.IsValidWpaSuppDriver('wext'))
|
||||
mock_syscall.assert_called_once()
|
||||
|
||||
def test_needs_external_calls_not_implemented(self):
|
||||
self.assertRaises(NotImplementedError, wnettools.NeedsExternalCalls)
|
||||
|
||||
def test_is_up_boolean(self):
|
||||
self.assertTrue(type(self.interface.IsUp()) == bool)
|
||||
|
||||
def test_enable_debug_mode(self):
|
||||
self.interface.SetDebugMode(True)
|
||||
self.assertTrue(self.interface.verbose)
|
||||
|
||||
def test_disable_debug_mode(self):
|
||||
self.interface.SetDebugMode(False)
|
||||
self.assertFalse(self.interface.verbose)
|
||||
|
||||
def test_interface_name_sanitation(self):
|
||||
interface = wnettools.BaseInterface('blahblah; uptime > /tmp/blah | '
|
||||
'cat')
|
||||
self.assertEqual(interface.iface, 'blahblahuptimetmpblahcat')
|
||||
|
||||
def test_freq_translation_low(self):
|
||||
freq = '2.412 GHz'
|
||||
interface = wnettools.BaseWirelessInterface('wlan0')
|
||||
self.assertEqual(interface._FreqToChannel(freq), 1)
|
||||
|
||||
def test_freq_translation_high(self):
|
||||
freq = '2.484 GHz'
|
||||
interface = wnettools.BaseWirelessInterface('wlan0')
|
||||
self.assertEqual(interface._FreqToChannel(freq), 14)
|
||||
|
||||
def test_generate_psk(self):
|
||||
interface = wnettools.BaseWirelessInterface('wlan0')
|
||||
if 'wlan0' in wnettools.GetWirelessInterfaces():
|
||||
psk = interface.GeneratePSK({'essid': 'Network 1',
|
||||
'key': 'arandompassphrase'})
|
||||
self.assertEqual(psk, 'd70463014514f4b4ebb8e3aebbdec13f4437ac3a9a'
|
||||
'f084b3433f3710e658a7be')
|
||||
|
||||
|
||||
def suite():
|
||||
suite = unittest.TestSuite()
|
||||
tests = []
|
||||
[ tests.append(test) for test in dir(TestWnettools) if test.startswith('test') ]
|
||||
for test in tests:
|
||||
suite.addTest(TestWnettools(test))
|
||||
return suite
|
||||
suite = unittest.TestSuite()
|
||||
tests = []
|
||||
[tests.append(test) for test in dir(TestWnettools)
|
||||
if test.startswith('test')]
|
||||
for test in tests:
|
||||
suite.addTest(TestWnettools(test))
|
||||
return suite
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
unittest.main()
|
||||
|
||||
Reference in New Issue
Block a user