Merge "Test fixes: unittest.mock, better l-c job, pytest dep"

.zuul.yaml

@@ -2,7 +2,7 @@
     templates:
       - check-requirements
       - horizon-non-primary-django-jobs
-      - openstack-lower-constraints-jobs
+      - openstack-lower-constraints-jobs-horizon
       - openstack-python3-ussuri-jobs-horizon
       - release-notes-jobs-python3
     experimental:

lower-constraints.txt

@@ -38,7 +38,6 @@ kombu==4.0.0
 linecache2==1.0.0
 MarkupSafe==1.0
 mccabe==0.2.1
-mock==2.0.0
 monotonic==0.6
 msgpack-python==0.4.0
 munch==2.1.0
@@ -75,6 +74,7 @@ pyOpenSSL==17.1.0
 pyparsing==2.1.0
 pyperclip==1.5.27
 pyScss==1.3.7
+pytest==5.3.5
 python-dateutil==2.5.3
 python-designateclient==2.7.0
 python-glanceclient==2.8.0

sahara_dashboard/content/data_processing/clusters/nodegroup_templates/tests.py

@@ -10,8 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 from django.urls import reverse
-import mock
 
 from openstack_dashboard import api as dash_api
 

sahara_dashboard/content/data_processing/data_plugins/tests.py

@@ -10,8 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 from django.urls import reverse
-import mock
 
 from sahara_dashboard import api
 from sahara_dashboard.test import helpers as test

sahara_dashboard/content/data_processing/jobs/data_sources/tests.py

@@ -10,8 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 from django.urls import reverse
-import mock
 
 from sahara_dashboard import api
 from sahara_dashboard.test import helpers as test

sahara_dashboard/content/data_processing/jobs/job_binaries/tests.py

@@ -10,8 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 from django.urls import reverse
-import mock
 
 from sahara_dashboard import api
 from sahara_dashboard.test import helpers as test

sahara_dashboard/content/data_processing/jobs/job_templates/tests.py

@@ -10,8 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 from django.urls import reverse
-import mock
 
 from sahara_dashboard import api
 from sahara_dashboard.test import helpers as test

sahara_dashboard/test/helpers.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from openstack_dashboard.test import helpers
 

test-requirements.txt

@@ -5,8 +5,8 @@
 hacking>=3.0,<3.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
-mock>=2.0.0 # BSD
 netifaces>=0.10.4 # MIT
+pytest>=5.3.5 # MIT
 python-subunit>=1.0.0 # Apache-2.0/BSD
 selenium>=2.50.1 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD