chore: run unittest2pytest on all unit tests

1 files changed, 40 insertions, 41 deletions

diff --git a/gitlab/tests/test_config.py b/gitlab/tests/test_config.py
index 681b3d1..abdeed0 100644
--- a/gitlab/tests/test_config.py
+++ b/gitlab/tests/test_config.py
@@ -22,6 +22,7 @@ import mock
 import io
 
 from gitlab import config
+import pytest
 
 
 valid_config = u"""[global]
@@ -76,18 +77,18 @@ per_page = 200
 class TestEnvConfig(unittest.TestCase):
     def test_env_present(self):
         with mock.patch.dict(os.environ, {"PYTHON_GITLAB_CFG": "/some/path"}):
-            self.assertEqual(["/some/path"], config._env_config())
+            assert ["/some/path"] == config._env_config()
 
     def test_env_missing(self):
         with mock.patch.dict(os.environ, {}, clear=True):
-            self.assertEqual([], config._env_config())
+            assert [] == config._env_config()
 
 
 class TestConfigParser(unittest.TestCase):
     @mock.patch("os.path.exists")
     def test_missing_config(self, path_exists):
         path_exists.return_value = False
-        with self.assertRaises(config.GitlabConfigMissingError):
+        with pytest.raises(config.GitlabConfigMissingError):
             config.GitlabConfigParser("test")
 
     @mock.patch("os.path.exists")
@@ -98,14 +99,14 @@ class TestConfigParser(unittest.TestCase):
         m_open.return_value = fd
         path_exists.return_value = True
         config.GitlabConfigParser("there")
-        self.assertRaises(config.GitlabIDError, config.GitlabConfigParser)
+        with pytest.raises(config.GitlabIDError):
+            config.GitlabConfigParser()
 
         fd = io.StringIO(valid_config)
         fd.close = mock.Mock(return_value=None)
         m_open.return_value = fd
-        self.assertRaises(
-            config.GitlabDataError, config.GitlabConfigParser, gitlab_id="not_there"
-        )
+        with pytest.raises(config.GitlabDataError):
+            config.GitlabConfigParser(gitlab_id="not_there")
 
     @mock.patch("os.path.exists")
     @mock.patch("builtins.open")
@@ -117,15 +118,13 @@ class TestConfigParser(unittest.TestCase):
 
         config.GitlabConfigParser("one")
         config.GitlabConfigParser("one")
-        self.assertRaises(
-            config.GitlabDataError, config.GitlabConfigParser, gitlab_id="two"
-        )
-        self.assertRaises(
-            config.GitlabDataError, config.GitlabConfigParser, gitlab_id="three"
-        )
-        with self.assertRaises(config.GitlabDataError) as emgr:
+        with pytest.raises(config.GitlabDataError):
+            config.GitlabConfigParser(gitlab_id="two")
+        with pytest.raises(config.GitlabDataError):
+            config.GitlabConfigParser(gitlab_id="three")
+        with pytest.raises(config.GitlabDataError) as emgr:
             config.GitlabConfigParser("four")
-        self.assertEqual("Unsupported per_page number: 200", emgr.exception.args[0])
+        assert "Unsupported per_page number: 200" == emgr.value.args[0]
 
     @mock.patch("os.path.exists")
     @mock.patch("builtins.open")
@@ -136,44 +135,44 @@ class TestConfigParser(unittest.TestCase):
         path_exists.return_value = True
 
         cp = config.GitlabConfigParser()
-        self.assertEqual("one", cp.gitlab_id)
-        self.assertEqual("http://one.url", cp.url)
-        self.assertEqual("ABCDEF", cp.private_token)
-        self.assertEqual(None, cp.oauth_token)
-        self.assertEqual(2, cp.timeout)
-        self.assertEqual(True, cp.ssl_verify)
-        self.assertIsNone(cp.per_page)
+        assert "one" == cp.gitlab_id
+        assert "http://one.url" == cp.url
+        assert "ABCDEF" == cp.private_token
+        assert None == cp.oauth_token
+        assert 2 == cp.timeout
+        assert True == cp.ssl_verify
+        assert cp.per_page is None
 
         fd = io.StringIO(valid_config)
         fd.close = mock.Mock(return_value=None)
         m_open.return_value = fd
         cp = config.GitlabConfigParser(gitlab_id="two")
-        self.assertEqual("two", cp.gitlab_id)
-        self.assertEqual("https://two.url", cp.url)
-        self.assertEqual("GHIJKL", cp.private_token)
-        self.assertEqual(None, cp.oauth_token)
-        self.assertEqual(10, cp.timeout)
-        self.assertEqual(False, cp.ssl_verify)
+        assert "two" == cp.gitlab_id
+        assert "https://two.url" == cp.url
+        assert "GHIJKL" == cp.private_token
+        assert None == cp.oauth_token
+        assert 10 == cp.timeout
+        assert False == cp.ssl_verify
 
         fd = io.StringIO(valid_config)
         fd.close = mock.Mock(return_value=None)
         m_open.return_value = fd
         cp = config.GitlabConfigParser(gitlab_id="three")
-        self.assertEqual("three", cp.gitlab_id)
-        self.assertEqual("https://three.url", cp.url)
-        self.assertEqual("MNOPQR", cp.private_token)
-        self.assertEqual(None, cp.oauth_token)
-        self.assertEqual(2, cp.timeout)
-        self.assertEqual("/path/to/CA/bundle.crt", cp.ssl_verify)
-        self.assertEqual(50, cp.per_page)
+        assert "three" == cp.gitlab_id
+        assert "https://three.url" == cp.url
+        assert "MNOPQR" == cp.private_token
+        assert None == cp.oauth_token
+        assert 2 == cp.timeout
+        assert "/path/to/CA/bundle.crt" == cp.ssl_verify
+        assert 50 == cp.per_page
 
         fd = io.StringIO(valid_config)
         fd.close = mock.Mock(return_value=None)
         m_open.return_value = fd
         cp = config.GitlabConfigParser(gitlab_id="four")
-        self.assertEqual("four", cp.gitlab_id)
-        self.assertEqual("https://four.url", cp.url)
-        self.assertEqual(None, cp.private_token)
-        self.assertEqual("STUV", cp.oauth_token)
-        self.assertEqual(2, cp.timeout)
-        self.assertEqual(True, cp.ssl_verify)
+        assert "four" == cp.gitlab_id
+        assert "https://four.url" == cp.url
+        assert None == cp.private_token
+        assert "STUV" == cp.oauth_token
+        assert 2 == cp.timeout
+        assert True == cp.ssl_verify