Attachment #201184 for bug #281099

View | Details | Raw Unified | Return to bug 281099
Collapse All | Expand All

Lines 7-13 check: check-nonm Link Here

(-)a/Makefile (-1 / +1 lines)
7		7
8	check-nonm:	8	check-nonm:
9	for T in `find . -name \*.py \| xargs grep -l '>>>'`; do python $$T; done	9	for T in `find . -name \*.py \| xargs grep -l '>>>'`; do python $$T; done
10	for T in test/test01*.py; do $$T; done	10	for T in test/test01*.py; do PYTHONPATH=. $$T; done
11		11
12	install:	12	install:
13	$(SETUP) install	13	$(SETUP) install




    def __init__(self, ssid, key, hashed_key=""):
        "One of key, hashed_key must be present"

        super(Wep, self).__init__(ssid)
        self["802-11-wireless"]["security"] = "802-11-wireless-security"
        self["802-11-wireless-security"] = {}
        self["802-11-wireless-security"]["key-mgmt"] = "none"

    def __init__(self, ssid, key, hashed_key=""):
        "One of key, hashed_key must be present"

        super(WpaPsk, self).__init__(ssid)
        self["802-11-wireless"]["security"] = "802-11-wireless-security"
        self["802-11-wireless-security"] = {}
        self["802-11-wireless-security"]["group"] =    ["tkip", "ccmp"]
        self["802-11-wireless-security"]["pairwise"] = ["tkip", "ccmp"]
        self["802-11-wireless-security"]["key-mgmt"] = "wpa-psk"
        if hashed_key == "":

Lines 4-9 import subprocess Link Here

(-)a/test/test01-nofail.py (+18 lines)
4	import sys	4	import sys
5	import unittest	5	import unittest
6		6
		7	import networkmanager.applet.settings as settings
		8
7	class NoFail(unittest.TestCase):	9	class NoFail(unittest.TestCase):
8	def callIt(self, params):	10	def callIt(self, params):
9	cmd = sys.path[0] + '/../cnetworkmanager'	11	cmd = sys.path[0] + '/../cnetworkmanager'
Lines 19-23 class NoFail(unittest.TestCase): Link Here
19	def testHelp(self):	21	def testHelp(self):
20	self.callIt("--help")	22	self.callIt("--help")
21		23
		24	class SettingsFactory(unittest.TestCase):
		25	def testWiFi(self):
		26	ssid = "foo"
		27	c = settings.WiFi(ssid)
		28
		29	def testWep(self):
		30	ssid = "foo"
		31	c1 = settings.Wep(ssid, "wep_pass")
		32	c2 = settings.Wep(ssid, "", "ffffffffffffffffffffffffff")
		33
		34	def testWpa(self):
		35	ssid = "foo"
		36	c1 = settings.WpaPsk(ssid, "wep_pass")
		37	c2 = settings.WpaPsk(ssid, "", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
		38
		39
22	if __name__ == '__main__':	40	if __name__ == '__main__':
23	unittest.main()	41	unittest.main()

Return to bug 281099

Lines 104-110 class Wep(WiFi): Link Here

(-)a/networkmanager/applet/settings.py (-3 / +3 lines)
104	def __init__(self, ssid, key, hashed_key=""):	104	def __init__(self, ssid, key, hashed_key=""):
105	"One of key, hashed_key must be present"	105	"One of key, hashed_key must be present"
106		106
107	super(WiFi, self).__init__(ssid)	107	super(Wep, self).__init__(ssid)
108	self["802-11-wireless"]["security"] = "802-11-wireless-security"	108	self["802-11-wireless"]["security"] = "802-11-wireless-security"
109	self["802-11-wireless-security"] = {}	109	self["802-11-wireless-security"] = {}
110	self["802-11-wireless-security"]["key-mgmt"] = "none"	110	self["802-11-wireless-security"]["key-mgmt"] = "none"
Lines 126-135 class WpaPsk(WiFi): Link Here
126	def __init__(self, ssid, key, hashed_key=""):	126	def __init__(self, ssid, key, hashed_key=""):
127	"One of key, hashed_key must be present"	127	"One of key, hashed_key must be present"
128		128
129	super(WiFi, self).__init__(ssid)	129	super(WpaPsk, self).__init__(ssid)
130	self["802-11-wireless"]["security"] = "802-11-wireless-security"	130	self["802-11-wireless"]["security"] = "802-11-wireless-security"
131	self["802-11-wireless-security"] = {}	131	self["802-11-wireless-security"] = {}
132	self["802-11-wireless-security"]["group"] = ["tkip", "cselfp"]	132	self["802-11-wireless-security"]["group"] = ["tkip", "ccmp"]
133	self["802-11-wireless-security"]["pairwise"] = ["tkip", "ccmp"]	133	self["802-11-wireless-security"]["pairwise"] = ["tkip", "ccmp"]
134	self["802-11-wireless-security"]["key-mgmt"] = "wpa-psk"	134	self["802-11-wireless-security"]["key-mgmt"] = "wpa-psk"
135	if hashed_key == "":	135	if hashed_key == "":