ChristinaMeno

diff --git a/storyville/conf/local.py b/storyville/conf/local.py
index ad32f1e..769f4fb 100644
--- a/storyville/conf/local.py
+++ b/storyville/conf/local.py
@@ -25,6 +25,13 @@ DATABASES['strongmail'].update({
         'TEST_NAME': '%s' % STRONGMAIL_DB_NAME,
     })
 
+DATABASES['amgdb'].update({
+        #'NAME': 'amgdb',

ChristinaMeno

def get_required_databases(suite):    
    """ given a test suite, return all the databases that
        these testcase-classes publish as requirements
    """                               
    required_databases = []
    for testclass in set([x.__class__ for x in suite._tests]):
        required_databases.extend(db_requirements(testclass)
       
    return list(set(required_databases))

ChristinaMeno

diff --git a/medley/playlist/tests/tests.py b/medley/playlist/tests/tests.py
index 4cf9bcd..d20c8e5 100644
--- a/medley/playlist/tests/tests.py
+++ b/medley/playlist/tests/tests.py
@@ -273,6 +273,7 @@ class APITestCase(TestCase):
         #   - Setting object (for cache timeout)
 
         self.client.get('/lsp/_api/v1/stream/?format=json')
+        print connection.queries
         self.assertEqual(5, len(connection.queries))

ChristinaMeno

diff --git a/medley/videos/admin.py b/medley/videos/admin.py
index 04f7250..6260441 100644
--- a/medley/videos/admin.py
+++ b/medley/videos/admin.py
@@ -17,7 +17,7 @@ class VideoAdmin(MedleyBaseModelAdmin):
     prepopulated_fields = {"slug": ('title',),}
     list_display = ('title', 'pub_date', 'primary_category', 'originating_site', 'status',)
     list_filter = ('sites', 'pub_date', 'status', 'comment_status', 'categories', )
-    search_fields = ('player_url', 'title',)
+    search_fields = ('player_url', 'title', 'description', 'topics__tag__name')

ChristinaMeno

Personality/ ability to reason:
which one doesn't fit and why: boulder builder beaver

ChristinaMeno

diff --git a/tictactoe/apps/core/views.py b/tictactoe/apps/core/views.py
index 9da2f0e..edfaf4b 100644
--- a/tictactoe/apps/core/views.py
+++ b/tictactoe/apps/core/views.py
@@ -113,21 +113,9 @@ def _get_computer():
 def create_computer_game(request):
     bot = _get_computer()
 
-    coin_toss = random.choice([0, 1])
-

ChristinaMeno

from datetime import time
from datetime import datetime

broadcast_start = time(*map(int, time(12,41,).strftime('%H:%M').split(':')))
broadcast_end = time(*map(int, time(15,41,).strftime('%H:%M').split(':')))

broadcast_start <= datetime.now().time() < broadcast_end

ChristinaMeno

diff --git a/medley/playlist/tests/tests.py b/medley/playlist/tests/tests.py
index 56d7ca4..b350f56 100644
--- a/medley/playlist/tests/tests.py
+++ b/medley/playlist/tests/tests.py
@@ -15,6 +15,9 @@ from medley.playlist.models import Artist, Track, History, ArtistImage, Snapshot
 from medley.playlist.trailer.amazon import AmazonTrailer
 
 
+class RequiresAMGTestCase(TestCase):
+    requires_databases = ['default', 'amgdb']

ChristinaMeno

@periodic_task(run_every=timedelta(hours=1), ignore_result=True )
def reset_cac_timeslots():
    """
    Reset the available appointments in any CAC time slot that ended in the last hour.

    Note that this code is not timezone aware and therefore may not behave
    as expected if a time slot ends between 2 and 3 AM.
    """
    now = datetime.now()
    day_start = datetime.combine(now.date(), datetime.time(now).min)

ChristinaMeno

diff --git a/medley/extensions/search_indexes.py b/medley/extensions/search_indexes.py
index 852edfd..c060df6 100644
--- a/medley/extensions/search_indexes.py
+++ b/medley/extensions/search_indexes.py
@@ -57,6 +57,7 @@ from ellington.maps.search_indexes import StaticMapIndex
 from ellington.places.search_indexes import PlaceIndex
 from ellington.movies.search_indexes import MovieIndex
 
+from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.models import User