Merge pull request #21582 from edx/feanil/fix_more_test_collection_issues

Feanil/fix more test collection issues

openedx/core/djangoapps/user_api/management/tests/test_populate_retirement_states.py

@@ -87,7 +87,7 @@ def test_out_of_order_start_state(settings):
     del settings.RETIREMENT_STATES[0]
     settings.RETIREMENT_STATES.insert(4, 'PENDING')
 
-    with pytest.raises(CommandError, match=ur'{} must be the first state'.format(START_STATE)):
+    with pytest.raises(CommandError, match=u'{} must be the first state'.format(START_STATE)):
         call_command('populate_retirement_states')
 
 

pavelib/paver_tests/test_paver_bok_choy_cmds.py

@@ -6,7 +6,12 @@ from __future__ import absolute_import
 
 import os
 import unittest
-from test.test_support import EnvironmentVarGuard
+import six
+
+if six.PY2:
+    from test.test_support import EnvironmentVarGuard
+else:
+    from test.support import EnvironmentVarGuard   # pylint: disable=import-error,no-name-in-module
 
 from pavelib.utils.test.suites import BokChoyTestSuite