Merge pull request #67 from ushiboy/release/1.3.0

Release 1.3.0

Author: ushiboy

README.md

@@ -249,7 +249,7 @@ nmcli.device.delete(ifname: str, wait: int = None) -> None
 List available Wi-Fi access points.
 
 ```
-nmcli.device.wifi(ifname: str = None) -> List[DeviceWifi]
+nmcli.device.wifi(ifname: str = None, rescan: bool = None) -> List[DeviceWifi]
 ```
 
 #### nmcli.device.wifi_connect
@@ -459,6 +459,10 @@ nmcli.set_lang(lang: str) -> None
 
 ## Change Log
 
+### 1.3.0
+
+- Added rescan parameter to `nmcli.device.wifi`.
+
 ### 1.2.0
 
 - Added support for encodings other than UTF-8.

nmcli/_device.py

@@ -60,7 +60,7 @@ def reapply(self, ifname: str) -> None:
     def delete(self, ifname: str, wait: int = None) -> None:
         raise NotImplementedError
 
-    def wifi(self, ifname: str = None) -> List[DeviceWifi]:
+    def wifi(self, ifname: str = None, rescan: bool = None) -> List[DeviceWifi]:
         raise NotImplementedError
 
     def wifi_connect(self,

nmcli/dummy/_device.py

@@ -61,7 +61,7 @@ def __init__(self,
         self._disconnect_args: List[Tuple] = []
         self._reapply_args: List[str] = []
         self._delete_args: List[Tuple] = []
-        self._wifi_args: List[str] = []
+        self._wifi_args: List[Tuple] = []
         self._wifi_connect_args: List[Tuple] = []
         self._wifi_hotspot_args: List[Tuple] = []
         self._wifi_rescan_args: List[Tuple] = []
@@ -101,10 +101,9 @@ def delete(self, ifname: str, wait: int = None) -> None:
         self._raise_error_if_needed()
         self._delete_args.append((ifname, wait))
 
-    def wifi(self, ifname: str = None) -> List[DeviceWifi]:
+    def wifi(self, ifname: str = None, rescan: bool = None) -> List[DeviceWifi]:
         self._raise_error_if_needed()
-        if ifname is not None:
-            self._wifi_args.append(ifname)
+        self._wifi_args.append((ifname, rescan))
         return self._result_wifi
 
     def wifi_connect(self,

setup.py

@@ -13,7 +13,7 @@ def run_tests(self):
 
 setup(
     name='nmcli',
-    version='1.2.0',
+    version='1.3.0',
     author='ushiboy',
     license='MIT',
     license_files = ('LICENSE.txt',),

tests/dummy/test_device.py

@@ -123,7 +123,11 @@ def test_wifi():
     assert c.wifi() == result_wifi
     ifname = 'wlan0'
     assert c.wifi(ifname) == result_wifi
-    assert c.wifi_args == [ifname]
+    assert c.wifi(rescan=True) == result_wifi
+    assert c.wifi(rescan=False) == result_wifi
+    assert c.wifi(ifname, rescan=True) == result_wifi
+    assert c.wifi_args == [(None, None), (ifname, None),
+                           (None, True), (None, False), (ifname, True)]
 
 
 def test_wifi_when_raise_error():

tests/test_device.py

@@ -252,6 +252,21 @@ def test_device_wifi():
                                     'IN-USE,SSID,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,SECURITY',
                                     'device', 'wifi', 'list', 'ifname', ifname]
 
+    device.wifi(rescan=True)
+    assert s2.passed_parameters == ['-t', '-f',
+                                    'IN-USE,SSID,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,SECURITY',
+                                    'device', 'wifi', 'list', '--rescan', "yes"]
+
+    device.wifi(rescan=False)
+    assert s2.passed_parameters == ['-t', '-f',
+                                    'IN-USE,SSID,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,SECURITY',
+                                    'device', 'wifi', 'list', '--rescan', "no"]
+
+    device.wifi(ifname, rescan=True)
+    assert s2.passed_parameters == ['-t', '-f',
+                                    'IN-USE,SSID,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,SECURITY',
+                                    'device', 'wifi', 'list', 'ifname', ifname, '--rescan', "yes"]
+
 
 def test_wifi_connect():
     s = DummySystemCommand()