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:
Chris Church 2014-04-01 14:56:37 -04:00
parent 8fc0450dd9
commit 1c649a0752
6 changed files with 7 additions and 5 deletions

2
.gitignore vendored
View File

@ -1,7 +1,7 @@
awx/settings/local_settings.py*
awx/*.sqlite3
awx/projects
awx/job_status
awx/job_output
awx/public/media
awx/public/static
awx/ui/static/js/awx.min.js

View File

@ -42,7 +42,8 @@ class ActivityStreamTest(BaseTest):
self.check_pagination_and_size(response, 1, previous=None, next=None)
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):
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'])
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):
response = self.get(org_item, expect=200)

View File

@ -27,7 +27,7 @@ Django>=1.4
django-debug-toolbar
django-devserver
unittest2
django-jenkins
django-jenkins<0.15
ipython
# You may also need to install the following extra packages using the OS

View File

@ -86,7 +86,7 @@ pylint-1.1.0.tar.gz
# Remaining dev-only packages:
django-debug-toolbar-1.0.1.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
# You may also need to install the following extra packages using the OS

Binary file not shown.