From 0572f62075f54f3e48836dc711f4b4cb9feb19f6 Mon Sep 17 00:00:00 2001
From: Nuwan Goonasekera <2070605+nuwang@users.noreply.github.com>
Date: Mon, 22 Nov 2021 00:49:12 +0530
Subject: [PATCH] Fix vault linting errors

---
 lib/galaxy/security/vault.py            | 4 ++--
 lib/galaxy_test/api/test_vault.py       | 3 +--
 test/unit/app/dependencies/test_deps.py | 1 +
 test/unit/security/test_vault.py        | 7 ++++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/galaxy/security/vault.py b/lib/galaxy/security/vault.py
index 360bd16379f..6a3fb4798eb 100644
--- a/lib/galaxy/security/vault.py
+++ b/lib/galaxy/security/vault.py
@@ -1,9 +1,9 @@
-from abc import ABC
 import json
 import logging
 import os
-import yaml
+from abc import ABC
 
+import yaml
 from cryptography.fernet import Fernet, MultiFernet
 
 try:
diff --git a/lib/galaxy_test/api/test_vault.py b/lib/galaxy_test/api/test_vault.py
index f8e83bf92ec..519d41f8f51 100644
--- a/lib/galaxy_test/api/test_vault.py
+++ b/lib/galaxy_test/api/test_vault.py
@@ -2,14 +2,13 @@ import json
 import os
 
 from requests import (
-    delete,
     get,
     put
 )
 
 from ._framework import ApiTestCase
 
-TEST_USER_EMAIL = "user_for_users_index_test@bx.psu.edu"
+TEST_USER_EMAIL = "vault_test_user@bx.psu.edu"
 
 
 class VaultApiTestCase(ApiTestCase):
diff --git a/test/unit/app/dependencies/test_deps.py b/test/unit/app/dependencies/test_deps.py
index 9e7bd4a0400..216cd0308b7 100644
--- a/test/unit/app/dependencies/test_deps.py
+++ b/test/unit/app/dependencies/test_deps.py
@@ -28,6 +28,7 @@ JOB_CONF_YAML = """
 runners:
   runner1:
     load: job_runner_A
+"""
 VAULT_CONF_CUSTOS = """
 type: custos
 """
diff --git a/test/unit/security/test_vault.py b/test/unit/security/test_vault.py
index 9cf5adb73f4..3c9768c8426 100644
--- a/test/unit/security/test_vault.py
+++ b/test/unit/security/test_vault.py
@@ -1,8 +1,10 @@
-from abc import ABC
 import os
 import string
 import tempfile
 import unittest
+from abc import ABC
+
+from cryptography.fernet import InvalidToken
 
 from galaxy.app_unittest_utils.galaxy_mock import MockApp, MockAppConfig
 from galaxy.security import vault
@@ -53,7 +55,6 @@ class TestDatabaseVault(VaultTestBase, unittest.TestCase):
         app.config.vault_config_file = VAULT_CONF_DATABASE_ROTATED
         self.vault = vault.VaultFactory.from_app(app)
         self.assertEqual(self.vault.read_secret("my/rotated/secret"), "hello rotated")
-        super().test_read_write_secret()
 
     def test_wrong_keys(self):
         config = MockAppConfig(vault_config_file=VAULT_CONF_DATABASE)
@@ -64,7 +65,7 @@ class TestDatabaseVault(VaultTestBase, unittest.TestCase):
         # should fail because decryption keys are the wrong
         app.config.vault_config_file = VAULT_CONF_DATABASE_INVALID
         self.vault = vault.VaultFactory.from_app(app)
-        with self.assertRaises(Exception):
+        with self.assertRaises(InvalidToken):
             self.vault.read_secret("my/incorrect/secret")