Commit cb31f100 authored by juga's avatar juga
Browse files

Merge branch 'maint' into 'maint' 

correct tests

See merge request !7
parents 48096a56 41683879

stem/util/test_tools.py

+3 −3
Changes for stem/util/test_tools.py: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -285,9 +285,9 @@ class TimedTestRunner(unittest.TextTestRunner): 
          vended API then please let us know.

          """



          return self.assertRaisesRegexp(exc_type, '^%s$' % re.escape(exc_msg), func, *args, **kwargs)

          return self.assertRaisesRegex(exc_type, '^%s$' % re.escape(exc_msg), func, *args, **kwargs)



        def assertRaisesRegexp(self, exc_type, exc_msg, func, *args, **kwargs):

        def assertRaisesRegex(self, exc_type, exc_msg, func, *args, **kwargs):

          if stem.prereq._is_python_26():

            try:

              func(*args, **kwargs)
@@ -295,7 +295,7 @@ class TimedTestRunner(unittest.TextTestRunner): 
            except exc_type as exc:

              self.assertTrue(re.search(exc_msg, str(exc), re.MULTILINE))

          else:

            return super(original_type, self).assertRaisesRegexp(exc_type, exc_msg, func, *args, **kwargs)

            return super(original_type, self).assertRaisesRegex(exc_type, exc_msg, func, *args, **kwargs)



        def id(self):

          return '%s.%s.%s' % (original_type.__module__, original_type.__name__, self._testMethodName)

test/unit/client/cell.py

+1 −1
Changes for test/unit/client/cell.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ class TestCell(unittest.TestCase): 
    self.assertEqual(3257622417, RelayCell(5, 'RELAY_BEGIN_DIR', '', digest.digest(), 564346860).digest)

    self.assertEqual(3257622417, RelayCell(5, 'RELAY_BEGIN_DIR', '', 3257622417, 564346860).digest)

    self.assertRaisesWith(ValueError, 'RELAY cell digest must be a hash, string, or int but was a list', RelayCell, 5, 'RELAY_BEGIN_DIR', '', [], 564346860)

    self.assertRaisesRegexp(ValueError, "Invalid enumeration 'NO_SUCH_COMMAND', options are RELAY_BEGIN, RELAY_DATA", RelayCell, 5, 'NO_SUCH_COMMAND', '', 5, 564346860)

    self.assertRaisesRegex(ValueError, "Invalid enumeration 'NO_SUCH_COMMAND', options are RELAY_BEGIN, RELAY_DATA", RelayCell, 5, 'NO_SUCH_COMMAND', '', 5, 564346860)



    mismatched_data_length_bytes = b''.join((

      b'\x00\x01',  # circ ID

test/unit/client/size.py

+1 −1
Changes for test/unit/client/size.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class TestSize(unittest.TestCase): 
    self.assertRaisesWith(ValueError, 'Packed values must be positive (attempted to pack -1 as a CHAR)', Size.CHAR.pack, -1)



    bad_size = Size('BAD_SIZE', 1, '!H')

    self.assertRaisesRegexp(ValueError, re.escape("'\\x00\\x12' is the wrong size for a BAD_SIZE field"), bad_size.pack, 18)

    self.assertRaisesRegex(ValueError, re.escape("'\\x00\\x12' is the wrong size for a BAD_SIZE field"), bad_size.pack, 18)



  def test_unpack(self):

    self.assertEqual(18, Size.CHAR.unpack(b'\x12'))

test/unit/descriptor/certificate.py

+1 −1
Changes for test/unit/descriptor/certificate.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ class TestEd25519Certificate(unittest.TestCase): 
    """



    exc_msg = re.escape("Ed25519 certificate wasn't propoerly base64 encoded (Incorrect padding):")

    self.assertRaisesRegexp(ValueError, exc_msg, Ed25519Certificate.from_base64, '\x02\x0323\x04')

    self.assertRaisesRegex(ValueError, exc_msg, Ed25519Certificate.from_base64, '\x02\x0323\x04')



  def test_too_short(self):

    """

test/unit/descriptor/collector.py

+5 −5
Changes for test/unit/descriptor/collector.py: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -112,13 +112,13 @@ class TestCollector(unittest.TestCase): 
    urlopen_mock.side_effect = IOError('boom')



    collector = CollecTor(retries = 0)

    self.assertRaisesRegexp(IOError, 'boom', collector.index)

    self.assertRaisesRegex(IOError, 'boom', collector.index)

    self.assertEqual(1, urlopen_mock.call_count)



    urlopen_mock.reset_mock()



    collector = CollecTor(retries = 4)

    self.assertRaisesRegexp(IOError, 'boom', collector.index)

    self.assertRaisesRegex(IOError, 'boom', collector.index)

    self.assertEqual(5, urlopen_mock.call_count)



  @patch(URL_OPEN, Mock(return_value = io.BytesIO(b'not json')))
@@ -126,9 +126,9 @@ class TestCollector(unittest.TestCase): 
    collector = CollecTor()



    if stem.prereq.is_python_3():

      self.assertRaisesRegexp(ValueError, 'Expecting value: line 1 column 1', collector.index, Compression.PLAINTEXT)

      self.assertRaisesRegex(ValueError, 'Expecting value: line 1 column 1', collector.index, Compression.PLAINTEXT)

    else:

      self.assertRaisesRegexp(ValueError, 'No JSON object could be decoded', collector.index, Compression.PLAINTEXT)

      self.assertRaisesRegex(ValueError, 'No JSON object could be decoded', collector.index, Compression.PLAINTEXT)



  def test_index_malformed_compression(self):

    for compression in (Compression.GZIP, Compression.BZ2, Compression.LZMA):
@@ -137,7 +137,7 @@ class TestCollector(unittest.TestCase): 


      with patch(URL_OPEN, Mock(return_value = io.BytesIO(b'not compressed'))):

        collector = CollecTor()

        self.assertRaisesRegexp(IOError, 'Failed to decompress as %s' % compression, collector.index, compression)

        self.assertRaisesRegex(IOError, 'Failed to decompress as %s' % compression, collector.index, compression)



  @patch('stem.descriptor.collector.CollecTor.index', Mock(return_value = EXAMPLE_INDEX))

  def test_files(self):