TE-2525 nose.tools removal part 1/2

openedx/core/djangoapps/user_api/accounts/tests/test_api.py

@@ -15,7 +15,6 @@ from django.core import mail
 from django.test import TestCase
 from django.test.client import RequestFactory
 from mock import Mock, patch
-from nose.tools import raises
 from six import iteritems
 
 from openedx.core.djangoapps.site_configuration.tests.factories import SiteFactory
@@ -391,34 +390,34 @@ class AccountCreationActivationAndPasswordChangeTest(TestCase):
         with self.assertRaises(AccountUsernameInvalid):
             create_account(long_username, self.PASSWORD, self.EMAIL)
 
-    @raises(AccountEmailInvalid)
     @ddt.data(*INVALID_EMAILS)
     def test_create_account_invalid_email(self, invalid_email):
-        create_account(self.USERNAME, self.PASSWORD, invalid_email)
+        with pytest.raises(AccountEmailInvalid):
+            create_account(self.USERNAME, self.PASSWORD, invalid_email)
 
-    @raises(AccountPasswordInvalid)
     @ddt.data(*INVALID_PASSWORDS)
     def test_create_account_invalid_password(self, invalid_password):
-        create_account(self.USERNAME, invalid_password, self.EMAIL)
+        with pytest.raises(AccountPasswordInvalid):
+            create_account(self.USERNAME, invalid_password, self.EMAIL)
 
-    @raises(AccountPasswordInvalid)
     def test_create_account_username_password_equal(self):
         # Username and password cannot be the same
-        create_account(self.USERNAME, self.USERNAME, self.EMAIL)
+        with pytest.raises(AccountPasswordInvalid):
+            create_account(self.USERNAME, self.USERNAME, self.EMAIL)
 
-    @raises(AccountRequestError)
     @ddt.data(*INVALID_USERNAMES)
     def test_create_account_invalid_username(self, invalid_username):
-        create_account(invalid_username, self.PASSWORD, self.EMAIL)
+        with pytest.raises(AccountRequestError):
+            create_account(invalid_username, self.PASSWORD, self.EMAIL)
 
     def test_create_account_prevent_auth_user_writes(self):
         with pytest.raises(UserAPIInternalError, message=SYSTEM_MAINTENANCE_MSG):
             with waffle().override(PREVENT_AUTH_USER_WRITES, True):
                 create_account(self.USERNAME, self.PASSWORD, self.EMAIL)
 
-    @raises(UserNotAuthorized)
     def test_activate_account_invalid_key(self):
-        activate_account(u'invalid')
+        with pytest.raises(UserNotAuthorized):
+            activate_account(u'invalid')
 
     def test_activate_account_prevent_auth_user_writes(self):
         activation_key = create_account(self.USERNAME, self.PASSWORD, self.EMAIL)

openedx/core/djangoapps/user_api/tests/test_helpers.py

@@ -5,10 +5,10 @@ import json
 import re
 import mock
 import ddt
+import pytest
 from django import forms
 from django.http import HttpRequest, HttpResponse
 from django.test import TestCase
-from nose.tools import raises
 from six import text_type
 
 from ..helpers import (
@@ -42,16 +42,16 @@ def intercepted_function(raise_error=None):
 class InterceptErrorsTest(TestCase):
     """Tests for the decorator that intercepts errors."""
 
-    @raises(FakeOutputException)
     def test_intercepts_errors(self):
-        intercepted_function(raise_error=FakeInputException)
+        with pytest.raises(FakeOutputException):
+            intercepted_function(raise_error=FakeInputException)
 
     def test_ignores_no_error(self):
         intercepted_function()
 
-    @raises(ValueError)
     def test_ignores_expected_errors(self):
-        intercepted_function(raise_error=ValueError)
+        with pytest.raises(ValueError):
+            intercepted_function(raise_error=ValueError)
 
     @mock.patch('openedx.core.djangoapps.user_api.helpers.LOGGER')
     def test_logs_errors(self, mock_logger):