Merge lp:~brendan-donegan/checkbox/create_connection_tests into lp:checkbox

[Brendan Donegan]

Tests to check create_connection script

Unmerged revisions

2054. By Brendan Donegan on 2013-04-19

Added a couple of tests for create_connection script

=== modified file 'scripts/create_connection'
--- scripts/create_connection	2013-04-17 20:18:21 +0000
+++ scripts/create_connection	2013-04-20 11:15:31 +0000
@@ -22,7 +22,7 @@
 id=%s
 uuid=%s
 type=802-11-wireless
-    """ % (ssid, uuid)
+""" % (ssid, uuid)
 
     wireless = """
 [802-11-wireless]
@@ -37,15 +37,14 @@
     wireless_security = """
 security=802-11-wireless-security
 
-[802-11-wireless-security]
-    """
+[802-11-wireless-security]"""
 
     if security.lower() == 'wpa':
         wireless_security += """
 key-mgmt=wpa-psk
 auth-alg=open
 psk=%s
-        """ % key
+""" % key
 
     elif security.lower() == 'wep':
         wireless_security += """
@@ -62,8 +61,7 @@
 method=auto
 
 [ipv6]
-method=auto
-    """
+method=auto"""
 
     return ip
 
@@ -186,6 +184,7 @@
         # Don't fail the script if unblock didn't work though
 
     wifi_connection += wifi_ip_sections()
+    import pdb; pdb.set_trace()
 
     # NetworkManager replaces forward-slashes in SSIDs with asterisks
     name = args.ssid.replace('/', '*')
 
=== added file 'test_scripts/tests/test_create_connection.py'
--- test_scripts/tests/test_create_connection.py	1970-01-01 00:00:00 +0000
+++ test_scripts/tests/test_create_connection.py	2013-04-20 11:15:31 +0000
@@ -0,0 +1,56 @@
+#
+# This file is part of Checkbox.
+#
+# Copyright 2013 Canonical Ltd.
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+#
+import imp
+import os
+import unittest
+
+imp.load_source('create_connection', os.path.join(os.path.dirname(__file__),
+                '..', '..', 'scripts', 'create_connection'))
+import create_connection
+
+class CreateConnectionTest(unittest.TestCase):
+
+    def test_wifi_connection_section(self):
+        ssid = 'checkbox'
+        uuid = '4567-a345-3235-90876'
+        expected_section = """
+[connection]
+id={id}
+uuid={uuid}
+type=802-11-wireless
+
+[802-11-wireless]
+ssid={id}
+mode=infrastructure""".format(id=ssid, uuid=uuid)
+        actual_section = create_connection.wifi_connection_section(ssid, uuid)
+        self.assertEqual(expected_section, actual_section)
+
+    def test_wifi_security_section(self):
+        security='wpa'
+        key='checkbox'
+        expected_section = """
+security=802-11-wireless-security
+
+[802-11-wireless-security]
+key-mgmt=wpa-psk
+auth-alg=open
+psk={key}
+""".format(key=key)
+        actual_section = create_connection.wifi_security_section(security, key)
+        self.assertEqual(expected_section, actual_section)