Adding upstream version 2.1.1.upstream/2.1.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 7 deletions

diff --git a/deluge/tests/test_authmanager.py b/deluge/tests/test_authmanager.py
index 91e122f..aa86fdb 100644
--- a/deluge/tests/test_authmanager.py
+++ b/deluge/tests/test_authmanager.py
@@ -1,20 +1,16 @@
-# -*- coding: utf-8 -*-
 #
 # This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with
 # the additional special exception to link portions of this program with the OpenSSL library.
 # See LICENSE for more details.
 #
 
-from __future__ import unicode_literals
-
 import deluge.component as component
 from deluge.common import get_localhost_auth
+from deluge.conftest import BaseTestCase
 from deluge.core.authmanager import AUTH_LEVEL_ADMIN, AuthManager
 
-from .basetest import BaseTestCase
-
 
-class AuthManagerTestCase(BaseTestCase):
+class TestAuthManager(BaseTestCase):
     def set_up(self):
         self.auth = AuthManager()
         self.auth.start()
@@ -24,4 +20,4 @@ class AuthManagerTestCase(BaseTestCase):
         return component.shutdown()
 
     def test_authorize(self):
-        self.assertEqual(self.auth.authorize(*get_localhost_auth()), AUTH_LEVEL_ADMIN)
+        assert self.auth.authorize(*get_localhost_auth()) == AUTH_LEVEL_ADMIN