1 files changed, 43 insertions, 39 deletions

diff --git a/kazoo/tests/test_paths.py b/kazoo/tests/test_paths.py
index 4f7fe94..730a189 100644
--- a/kazoo/tests/test_paths.py
+++ b/kazoo/tests/test_paths.py
@@ -1,6 +1,8 @@
 import sys
 from unittest import TestCase
 
+import pytest
+
 from kazoo.protocol import paths
 
 
@@ -15,87 +17,89 @@ else:  # pragma: nocover
 class NormPathTestCase(TestCase):
 
     def test_normpath(self):
-        self.assertEqual(paths.normpath('/a/b'), '/a/b')
+        assert paths.normpath('/a/b') == '/a/b'
 
     def test_normpath_empty(self):
-        self.assertEqual(paths.normpath(''), '')
+        assert paths.normpath('') == ''
 
     def test_normpath_unicode(self):
-        self.assertEqual(paths.normpath(u('/\xe4/b')), u('/\xe4/b'))
+        assert paths.normpath(u('/\xe4/b')) == u('/\xe4/b')
 
     def test_normpath_dots(self):
-        self.assertEqual(paths.normpath('/a./b../c'), '/a./b../c')
+        assert paths.normpath('/a./b../c') == '/a./b../c'
 
     def test_normpath_slash(self):
-        self.assertEqual(paths.normpath('/'), '/')
+        assert paths.normpath('/') == '/'
 
     def test_normpath_multiple_slashes(self):
-        self.assertEqual(paths.normpath('//'), '/')
-        self.assertEqual(paths.normpath('//a/b'), '/a/b')
-        self.assertEqual(paths.normpath('/a//b//'), '/a/b')
-        self.assertEqual(paths.normpath('//a////b///c/'), '/a/b/c')
+        assert paths.normpath('//') == '/'
+        assert paths.normpath('//a/b') == '/a/b'
+        assert paths.normpath('/a//b//') == '/a/b'
+        assert paths.normpath('//a////b///c/') == '/a/b/c'
 
     def test_normpath_relative(self):
-        self.assertRaises(ValueError, paths.normpath, './a/b')
-        self.assertRaises(ValueError, paths.normpath, '/a/../b')
+        with pytest.raises(ValueError):
+            paths.normpath('./a/b')
+        with pytest.raises(ValueError):
+            paths.normpath('/a/../b')
 
     def test_normpath_trailing(self):
-        self.assertEqual(paths.normpath('/', trailing=True), '/')
+        assert paths.normpath('/', trailing=True) == '/'
 
 
 class JoinTestCase(TestCase):
 
     def test_join(self):
-        self.assertEqual(paths.join('/a'), '/a')
-        self.assertEqual(paths.join('/a', 'b/'), '/a/b/')
-        self.assertEqual(paths.join('/a', 'b', 'c'), '/a/b/c')
+        assert paths.join('/a') == '/a'
+        assert paths.join('/a', 'b/') == '/a/b/'
+        assert paths.join('/a', 'b', 'c') == '/a/b/c'
 
     def test_join_empty(self):
-        self.assertEqual(paths.join(''), '')
-        self.assertEqual(paths.join('', 'a', 'b'), 'a/b')
-        self.assertEqual(paths.join('/a', '', 'b/', 'c'), '/a/b/c')
+        assert paths.join('') == ''
+        assert paths.join('', 'a', 'b') == 'a/b'
+        assert paths.join('/a', '', 'b/', 'c') == '/a/b/c'
 
     def test_join_absolute(self):
-        self.assertEqual(paths.join('/a/b', '/c'), '/c')
+        assert paths.join('/a/b', '/c') == '/c'
 
 
 class IsAbsTestCase(TestCase):
 
     def test_isabs(self):
-        self.assertTrue(paths.isabs('/'))
-        self.assertTrue(paths.isabs('/a'))
-        self.assertTrue(paths.isabs('/a//b/c'))
-        self.assertTrue(paths.isabs('//a/b'))
+        assert paths.isabs('/') is True
+        assert paths.isabs('/a') is True
+        assert paths.isabs('/a//b/c') is True
+        assert paths.isabs('//a/b') is True
 
     def test_isabs_false(self):
-        self.assertFalse(paths.isabs(''))
-        self.assertFalse(paths.isabs('a/'))
-        self.assertFalse(paths.isabs('a/../'))
+        assert paths.isabs('') is False
+        assert paths.isabs('a/') is False
+        assert paths.isabs('a/../') is False
 
 
 class BaseNameTestCase(TestCase):
 
     def test_basename(self):
-        self.assertEquals(paths.basename(''), '')
-        self.assertEquals(paths.basename('/'), '')
-        self.assertEquals(paths.basename('//a'), 'a')
-        self.assertEquals(paths.basename('//a/'), '')
-        self.assertEquals(paths.basename('/a/b.//c..'), 'c..')
+        assert paths.basename('') == ''
+        assert paths.basename('/') == ''
+        assert paths.basename('//a') == 'a'
+        assert paths.basename('//a/') == ''
+        assert paths.basename('/a/b.//c..') == 'c..'
 
 
 class PrefixRootTestCase(TestCase):
 
     def test_prefix_root(self):
-        self.assertEquals(paths._prefix_root('/a/', 'b/c'), '/a/b/c')
-        self.assertEquals(paths._prefix_root('/a/b', 'c/d'), '/a/b/c/d')
-        self.assertEquals(paths._prefix_root('/a', '/b/c'), '/a/b/c')
-        self.assertEquals(paths._prefix_root('/a', '//b/c.'), '/a/b/c.')
+        assert paths._prefix_root('/a/', 'b/c') == '/a/b/c'
+        assert paths._prefix_root('/a/b', 'c/d') == '/a/b/c/d'
+        assert paths._prefix_root('/a', '/b/c') == '/a/b/c'
+        assert paths._prefix_root('/a', '//b/c.') == '/a/b/c.'
 
 
 class NormRootTestCase(TestCase):
 
     def test_norm_root(self):
-        self.assertEquals(paths._norm_root(''), '/')
-        self.assertEquals(paths._norm_root('/'), '/')
-        self.assertEquals(paths._norm_root('//a'), '/a')
-        self.assertEquals(paths._norm_root('//a./b'), '/a./b')
+        assert paths._norm_root('') == '/'
+        assert paths._norm_root('/') == '/'
+        assert paths._norm_root('//a') == '/a'
+        assert paths._norm_root('//a./b') == '/a./b'