mirror of
https://github.com/ansible/awx.git
synced 2026-05-20 07:17:40 -02:30
AC-1108 Downgrade django-jenkins to get unit tests passing. Fix activity stream tests to not assume PK is always 1.
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,7 +1,7 @@
|
|||||||
awx/settings/local_settings.py*
|
awx/settings/local_settings.py*
|
||||||
awx/*.sqlite3
|
awx/*.sqlite3
|
||||||
awx/projects
|
awx/projects
|
||||||
awx/job_status
|
awx/job_output
|
||||||
awx/public/media
|
awx/public/media
|
||||||
awx/public/static
|
awx/public/static
|
||||||
awx/ui/static/js/awx.min.js
|
awx/ui/static/js/awx.min.js
|
||||||
|
|||||||
@@ -42,7 +42,8 @@ class ActivityStreamTest(BaseTest):
|
|||||||
self.check_pagination_and_size(response, 1, previous=None, next=None)
|
self.check_pagination_and_size(response, 1, previous=None, next=None)
|
||||||
|
|
||||||
def test_basic_fields(self):
|
def test_basic_fields(self):
|
||||||
org_item = self.item(1)
|
item_id = ActivityStream.objects.order_by('pk')[0].pk
|
||||||
|
org_item = self.item(item_id)
|
||||||
|
|
||||||
with self.current_user(self.super_django_user):
|
with self.current_user(self.super_django_user):
|
||||||
response = self.get(org_item, expect=200)
|
response = self.get(org_item, expect=200)
|
||||||
@@ -54,7 +55,8 @@ class ActivityStreamTest(BaseTest):
|
|||||||
self.assertTrue(response['summary_fields']['organization'][0]['name'] == self.org_created['name'])
|
self.assertTrue(response['summary_fields']['organization'][0]['name'] == self.org_created['name'])
|
||||||
|
|
||||||
def test_changeby_user(self):
|
def test_changeby_user(self):
|
||||||
org_item = self.item(1)
|
item_id = ActivityStream.objects.order_by('pk')[0].pk
|
||||||
|
org_item = self.item(item_id)
|
||||||
|
|
||||||
with self.current_user(self.super_django_user):
|
with self.current_user(self.super_django_user):
|
||||||
response = self.get(org_item, expect=200)
|
response = self.get(org_item, expect=200)
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ Django>=1.4
|
|||||||
django-debug-toolbar
|
django-debug-toolbar
|
||||||
django-devserver
|
django-devserver
|
||||||
unittest2
|
unittest2
|
||||||
django-jenkins
|
django-jenkins<0.15
|
||||||
ipython
|
ipython
|
||||||
|
|
||||||
# You may also need to install the following extra packages using the OS
|
# You may also need to install the following extra packages using the OS
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ pylint-1.1.0.tar.gz
|
|||||||
# Remaining dev-only packages:
|
# Remaining dev-only packages:
|
||||||
django-debug-toolbar-1.0.1.tar.gz
|
django-debug-toolbar-1.0.1.tar.gz
|
||||||
django-devserver-0.7.0.tar.gz
|
django-devserver-0.7.0.tar.gz
|
||||||
django-jenkins-0.15.0.tar.gz
|
django-jenkins-0.14.1.tar.gz
|
||||||
ipython-1.2.1.tar.gz
|
ipython-1.2.1.tar.gz
|
||||||
|
|
||||||
# You may also need to install the following extra packages using the OS
|
# You may also need to install the following extra packages using the OS
|
||||||
|
|||||||
BIN
requirements/django-jenkins-0.14.1.tar.gz
Normal file
BIN
requirements/django-jenkins-0.14.1.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user