Merge pull request #22508 from edx/BOM-1082

Updated the django-countries to support Django 2.2

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

@@ -71,6 +71,7 @@ SORTED_COUNTRIES = [
     (u"GQ", u"Equatorial Guinea"),
     (u"ER", u"Eritrea"),
     (u"EE", u"Estonia"),
+    (u"SZ", u"Eswatini"),
     (u"ET", u"Ethiopia"),
     (u"FK", u"Falkland Islands  [Malvinas]"),
     (u"FO", u"Faroe Islands"),
@@ -131,7 +132,6 @@ SORTED_COUNTRIES = [
     (u"LT", u"Lithuania"),
     (u"LU", u"Luxembourg"),
     (u"MO", u"Macao"),
-    (u"MK", u"Macedonia"),
     (u"MG", u"Madagascar"),
     (u"MW", u"Malawi"),
     (u"MY", u"Malaysia"),
@@ -165,6 +165,7 @@ SORTED_COUNTRIES = [
     (u"NU", u"Niue"),
     (u"NF", u"Norfolk Island"),
     (u"KP", u"North Korea"),
+    (u"MK", u"North Macedonia"),
     (u"MP", u"Northern Mariana Islands"),
     (u"NO", u"Norway"),
     (u"OM", u"Oman"),
@@ -215,7 +216,6 @@ SORTED_COUNTRIES = [
     (u"SD", u"Sudan"),
     (u"SR", u"Suriname"),
     (u"SJ", u"Svalbard and Jan Mayen"),
-    (u"SZ", u"Swaziland"),
     (u"SE", u"Sweden"),
     (u"CH", u"Switzerland"),
     (u"SY", u"Syria"),

openedx/core/djangoapps/user_authn/views/tests/test_register.py

@@ -302,7 +302,7 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, UserAPITestCase):
     YEAR_OF_BIRTH = "1998"
     ADDRESS = "123 Fake Street"
     CITY = "Springfield"
-    COUNTRY = "us"
+    COUNTRY = "US"
     GOALS = "Learn all the things!"
     PROFESSION_OPTIONS = [
         {