From 127c37ba6646d095e66cb9a85d872074b9b17df8 Mon Sep 17 00:00:00 2001
From: Andrew Zaborowski <andrew.zaborowski@intel.com>
Date: Thu, 9 Aug 2018 16:33:46 +0200
Subject: [PATCH] autotests: Test filesystem watch in testKnownNetworks

---
 .../testKnownNetworks/known_network_test.py      | 16 +++++++++++++++-
 .../testKnownNetworks/known_networks/ssidPSK.psk |  2 ++
 autotests/util/iwd.py                            |  6 +++++-
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 autotests/testKnownNetworks/known_networks/ssidPSK.psk

diff --git a/autotests/testKnownNetworks/known_network_test.py b/autotests/testKnownNetworks/known_network_test.py
index 2f022da1..49f5a3fc 100644
--- a/autotests/testKnownNetworks/known_network_test.py
+++ b/autotests/testKnownNetworks/known_network_test.py
@@ -40,7 +40,9 @@ class Test(unittest.TestCase):
         known_networks = wd.list_known_networks()
         self.assertEqual(len(known_networks), 3)
 
-        known_networks[0].forget()
+        for network in known_networks:
+            if network.name == 'ssidTKIP':
+                network.forget()
 
         known_networks = wd.list_known_networks()
         self.assertEqual(len(known_networks), 2)
@@ -50,6 +52,18 @@ class Test(unittest.TestCase):
         known_networks = wd.list_known_networks()
         self.assertEqual(len(known_networks), 3)
 
+        IWD.copy_to_storage('known_networks/ssidPSK.psk')
+        condition = 'len(obj.list_known_networks()) == 4'
+        wd.wait_for_object_condition(wd, condition, 1)
+
+        expected = ['ssidNew', 'ssidOpen', 'ssidPSK', 'ssidEAP-TLS']
+        self.assertEqual({n.name for n in wd.list_known_networks()},
+                         set(expected))
+
+        IWD.remove_from_storage('ssidPSK.psk')
+        condition = 'len(obj.list_known_networks()) == 3'
+        wd.wait_for_object_condition(wd, condition, 1)
+
         for net in known_networks:
             net.forget()
 
diff --git a/autotests/testKnownNetworks/known_networks/ssidPSK.psk b/autotests/testKnownNetworks/known_networks/ssidPSK.psk
new file mode 100644
index 00000000..b2fb3bc5
--- /dev/null
+++ b/autotests/testKnownNetworks/known_networks/ssidPSK.psk
@@ -0,0 +1,2 @@
+[Security]
+PreSharedKey=3397a05e2cf7b50a179ecc876422a40c84626d7eb3261d9baa080032b843f066
diff --git a/autotests/util/iwd.py b/autotests/util/iwd.py
index 41adde68..32f59149 100755
--- a/autotests/util/iwd.py
+++ b/autotests/util/iwd.py
@@ -537,7 +537,7 @@ class KnownNetwork(IWDDBusAbstract):
     @property
     def name(self):
         '''Contains the Name (SSID) of the network.'''
-        return self._properties['Name']
+        return str(self._properties['Name'])
 
     @property
     def type(self):
@@ -857,6 +857,10 @@ class IWD(AsyncOpAbstract):
         assert not os.path.isabs(source)
         shutil.copy(source, IWD_STORAGE_DIR)
 
+    @staticmethod
+    def remove_from_storage(file_name):
+        os.system('rm -rf ' + IWD_STORAGE_DIR + '/\'' + file_name + '\'')
+
     def list_devices(self, wait_to_appear = 0, max_wait = 15):
         if not wait_to_appear:
             return list(self._devices.values())