From c4b2540ecc7e215ff7278bc3712dcbd0e010f04a Mon Sep 17 00:00:00 2001
From: Abhijit Menon-Sen <ams@2ndQuadrant.com>
Date: Wed, 26 Aug 2015 19:52:20 +0530
Subject: [PATCH] Update tests for VaultEditor API changes

---
 test/units/parsing/vault/test_vault_editor.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/units/parsing/vault/test_vault_editor.py b/test/units/parsing/vault/test_vault_editor.py
index 2ddf3de27a2..d1fa0d07a05 100644
--- a/test/units/parsing/vault/test_vault_editor.py
+++ b/test/units/parsing/vault/test_vault_editor.py
@@ -81,7 +81,7 @@ class TestVaultEditor(unittest.TestCase):
         pass
 
     def test_methods_exist(self):
-        v = VaultEditor(None, None, None)
+        v = VaultEditor(None)
         slots = ['create_file',
                  'decrypt_file',
                  'edit_file',
@@ -103,8 +103,8 @@ class TestVaultEditor(unittest.TestCase):
         tmp_file = tempfile.NamedTemporaryFile()
         os.unlink(tmp_file.name)
 
-        ve = VaultEditor(None, "ansible", tmp_file.name)
-        ve.create_file()
+        ve = VaultEditor("ansible")
+        ve.create_file(tmp_file.name)
 
         self.assertTrue(os.path.exists(tmp_file.name))
 
@@ -120,12 +120,12 @@ class TestVaultEditor(unittest.TestCase):
         with v10_file as f:
             f.write(to_bytes(v10_data))
 
-        ve = VaultEditor(None, "ansible", v10_file.name)
+        ve = VaultEditor("ansible")
 
         # make sure the password functions for the cipher
         error_hit = False
         try:
-            ve.decrypt_file()
+            ve.decrypt_file(v10_file.name)
         except errors.AnsibleError as e:
             error_hit = True
 
@@ -148,12 +148,12 @@ class TestVaultEditor(unittest.TestCase):
         with v11_file as f:
             f.write(to_bytes(v11_data))
 
-        ve = VaultEditor(None, "ansible", v11_file.name)
+        ve = VaultEditor("ansible")
 
         # make sure the password functions for the cipher
         error_hit = False
         try:
-            ve.decrypt_file()
+            ve.decrypt_file(v11_file.name)
         except errors.AnsibleError as e:
             error_hit = True
 
@@ -180,12 +180,12 @@ class TestVaultEditor(unittest.TestCase):
         with v10_file as f:
             f.write(to_bytes(v10_data))
 
-        ve = VaultEditor(None, "ansible", v10_file.name)
+        ve = VaultEditor("ansible")
 
         # make sure the password functions for the cipher
         error_hit = False
         try:
-            ve.rekey_file('ansible2')
+            ve.rekey_file('ansible2', v10_file.name)
         except errors.AnsibleError as e:
             error_hit = True