From d558724676fab34c12d0a168565f29b80154e72c Mon Sep 17 00:00:00 2001
From: Andrew Zaborowski <andrew.zaborowski@intel.com>
Date: Mon, 3 Dec 2018 15:40:45 +0100
Subject: [PATCH] autotests: Update expected error in password length test

---
 autotests/testWPA2/password_test.py | 8 ++++----
 autotests/util/iwd.py               | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/autotests/testWPA2/password_test.py b/autotests/testWPA2/password_test.py
index cfb0911b..0397d8ae 100644
--- a/autotests/testWPA2/password_test.py
+++ b/autotests/testWPA2/password_test.py
@@ -42,25 +42,25 @@ class Test(unittest.TestCase):
         # 0 chars
         psk_agent = PSKAgent("")
         wd.register_psk_agent(psk_agent)
-        self.assertRaises(iwd.NotSupportedEx, network.connect)
+        self.assertRaises(iwd.InvalidFormatEx, network.connect)
         wd.unregister_psk_agent(psk_agent)
 
         # 7 chars
         psk_agent = PSKAgent("a" * 7)
         wd.register_psk_agent(psk_agent)
-        self.assertRaises(iwd.NotSupportedEx, network.connect)
+        self.assertRaises(iwd.InvalidFormatEx, network.connect)
         wd.unregister_psk_agent(psk_agent)
 
         # 64 chars
         psk_agent = PSKAgent("a" * 64)
         wd.register_psk_agent(psk_agent)
-        self.assertRaises(iwd.NotSupportedEx, network.connect)
+        self.assertRaises(iwd.InvalidFormatEx, network.connect)
         wd.unregister_psk_agent(psk_agent)
 
         # 64k chars
         psk_agent = PSKAgent("a" * 65536)
         wd.register_psk_agent(psk_agent)
-        self.assertRaises(iwd.NotSupportedEx, network.connect)
+        self.assertRaises(iwd.InvalidFormatEx, network.connect)
         wd.unregister_psk_agent(psk_agent)
 
         del wd
diff --git a/autotests/util/iwd.py b/autotests/util/iwd.py
index ee420990..942699ca 100755
--- a/autotests/util/iwd.py
+++ b/autotests/util/iwd.py
@@ -48,6 +48,7 @@ class FailedEx(dbus.DBusException): pass
 class AbortedEx(dbus.DBusException): pass
 class NotAvailableEx(dbus.DBusException): pass
 class InvalidArgsEx(dbus.DBusException): pass
+class InvalidFormatEx(dbus.DBusException): pass
 class AlreadyExistsEx(dbus.DBusException): pass
 class NotFoundEx(dbus.DBusException): pass
 class NotSupportedEx(dbus.DBusException): pass
@@ -69,6 +70,7 @@ _dbus_ex_to_py = {
     'Aborted' :         AbortedEx,
     'NotAvailable' :    NotAvailableEx,
     'InvalidArgs' :     InvalidArgsEx,
+    'InvalidFormat' :   InvalidFormatEx,
     'AlreadyExists' :   AlreadyExistsEx,
     'NotFound' :        NotFoundEx,
     'NotSupported' :    NotSupportedEx,