Merging upstream version 2.1.1 (Closes: #1026291).

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

1 files changed, 8 insertions, 10 deletions

diff --git a/deluge/tests/test_bencode.py b/deluge/tests/test_bencode.py
index b49c21f..a4a7681 100644
--- a/deluge/tests/test_bencode.py
+++ b/deluge/tests/test_bencode.py
@@ -1,19 +1,17 @@
-# -*- 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
 
-from twisted.trial import unittest
+import pytest
 
 from deluge import bencode
 
 from . import common
 
 
-class BencodeTestCase(unittest.TestCase):
+class TestBencode:
     def test_bencode_unicode_metainfo(self):
         filename = common.get_test_data_file('test.torrent')
         with open(filename, 'rb') as _file:
@@ -21,14 +19,14 @@ class BencodeTestCase(unittest.TestCase):
         bencode.bencode({b'info': metainfo})
 
     def test_bencode_unicode_value(self):
-        self.assertEqual(bencode.bencode(b'abc'), b'3:abc')
-        self.assertEqual(bencode.bencode('abc'), b'3:abc')
+        assert bencode.bencode(b'abc') == b'3:abc'
+        assert bencode.bencode('abc') == b'3:abc'
 
     def test_bdecode(self):
-        self.assertEqual(bencode.bdecode(b'3:dEf'), b'dEf')
-        with self.assertRaises(bencode.BTFailure):
+        assert bencode.bdecode(b'3:dEf') == b'dEf'
+        with pytest.raises(bencode.BTFailure):
             bencode.bdecode('dEf')
-        with self.assertRaises(bencode.BTFailure):
+        with pytest.raises(bencode.BTFailure):
             bencode.bdecode(b'dEf')
-        with self.assertRaises(bencode.BTFailure):
+        with pytest.raises(bencode.BTFailure):
             bencode.bdecode({'dEf': 123})