Merge pull request #15 from uw-it-aca/qa

Qa
uw-it-aca · Mar 1, 2016 · 34c48e4 · 34c48e4
2 parents 08b8ddc + 7280c6a
commit 34c48e4
Show file tree

Hide file tree

Showing 157 changed files with 853 additions and 516 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 # compiled files, swap files, system files, etc.
+*.egg-info/
 *.pyc
 *.swp
 .DS_Store

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1 @@
+-e .
diff --git a/requirements/ldap-requirements.txt b/requirements/ldap-requirements.txt
@@ -1,3 +1,3 @@
--r base-requirements.txt
 # on ubuntu, python-ldap requires the libldap2-dev, libssl-dev, and libsasl2-dev packages
 python-ldap
+-r ../requirements.txt
diff --git a/requirements/mysql-requirements.txt b/requirements/mysql-requirements.txt
@@ -1,2 +1,2 @@
--r base-requirements.txt
 mysql-python
+-r ../requirements.txt
diff --git a/requirements/oracle-requirements.txt b/requirements/oracle-requirements.txt
@@ -1,2 +1,2 @@
--r base-requirements.txt
 mysql-python
+-r ../requirements.txt
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
diff --git a/setup.py b/setup.py
@@ -5,5 +5,14 @@
 setup(name='SpaceScout-Server',
       version='1.0',
       description='REST Backend for SpaceScout',
-      install_requires=['Django>=1.4,<1.5','mock','oauth2','Pillow','pyproj','pytz','South','simplejson>=2.1','django-oauth-plus'],
+      install_requires=[
+                        'Django>=1.4,<1.5',
+                        'mock<=1.0.1',
+                        'oauth2<=1.5.211',
+                        'Pillow',
+                        'pyproj',
+                        'pytz',
+                        'South',
+                        'simplejson>=2.1',
+                        'django-oauth-plus<=2.2.5'],
      )
diff --git a/__init__.py → spotseeker_server/__init__.py b/__init__.py → spotseeker_server/__init__.py
diff --git a/admin.py → spotseeker_server/admin.py b/admin.py → spotseeker_server/admin.py
diff --git a/auth/__init__.py → spotseeker_server/auth/__init__.py b/auth/__init__.py → spotseeker_server/auth/__init__.py
diff --git a/auth/all_ok.py → spotseeker_server/auth/all_ok.py b/auth/all_ok.py → spotseeker_server/auth/all_ok.py
diff --git a/auth/fake_oauth.py → spotseeker_server/auth/fake_oauth.py b/auth/fake_oauth.py → spotseeker_server/auth/fake_oauth.py
diff --git a/auth/oauth.py → spotseeker_server/auth/oauth.py b/auth/oauth.py → spotseeker_server/auth/oauth.py
diff --git a/default_forms/__init__.py → spotseeker_server/default_forms/__init__.py b/default_forms/__init__.py → spotseeker_server/default_forms/__init__.py
diff --git a/default_forms/spot.py → spotseeker_server/default_forms/spot.py b/default_forms/spot.py → spotseeker_server/default_forms/spot.py
diff --git a/default_forms/spot_search.py → ...eeker_server/default_forms/spot_search.py b/default_forms/spot_search.py → ...eeker_server/default_forms/spot_search.py
diff --git a/dispatch.py → spotseeker_server/dispatch.py b/dispatch.py → spotseeker_server/dispatch.py
diff --git a/extras/delimage.py → spotseeker_server/extras/delimage.py b/extras/delimage.py → spotseeker_server/extras/delimage.py
diff --git a/extras/uw_server_values.py → spotseeker_server/extras/uw_server_values.py b/extras/uw_server_values.py → spotseeker_server/extras/uw_server_values.py
diff --git a/fixtures/uw.json → spotseeker_server/fixtures/uw.json b/fixtures/uw.json → spotseeker_server/fixtures/uw.json
diff --git a/forms/__init__.py → spotseeker_server/forms/__init__.py b/forms/__init__.py → spotseeker_server/forms/__init__.py
diff --git a/forms/spot.py → spotseeker_server/forms/spot.py b/forms/spot.py → spotseeker_server/forms/spot.py
diff --git a/forms/spot_search.py → spotseeker_server/forms/spot_search.py b/forms/spot_search.py → spotseeker_server/forms/spot_search.py
diff --git a/locale/en/LC_MESSAGES/django.mo → ...er_server/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo → ...er_server/locale/en/LC_MESSAGES/django.mo
diff --git a/locale/en/LC_MESSAGES/django.po → ...er_server/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po → ...er_server/locale/en/LC_MESSAGES/django.po
diff --git a/logger/__init__.py → spotseeker_server/logger/__init__.py b/logger/__init__.py → spotseeker_server/logger/__init__.py
diff --git a/logger/oauth.py → spotseeker_server/logger/oauth.py b/logger/oauth.py → spotseeker_server/logger/oauth.py
diff --git a/management/__init__.py → spotseeker_server/management/__init__.py b/management/__init__.py → spotseeker_server/management/__init__.py
diff --git a/management/commands/__init__.py → ...er_server/management/commands/__init__.py b/management/commands/__init__.py → ...er_server/management/commands/__init__.py
diff --git a/management/commands/create_consumer.py → ...er/management/commands/create_consumer.py b/management/commands/create_consumer.py → ...er/management/commands/create_consumer.py
diff --git a/management/commands/create_sample_spots.py → ...anagement/commands/create_sample_spots.py b/management/commands/create_sample_spots.py → ...anagement/commands/create_sample_spots.py
diff --git a/management/commands/resources/building3.jpg → ...nagement/commands/resources/building3.jpg b/management/commands/resources/building3.jpg → ...nagement/commands/resources/building3.jpg
diff --git a/management/commands/resources/building4.jpg → ...nagement/commands/resources/building4.jpg b/management/commands/resources/building4.jpg → ...nagement/commands/resources/building4.jpg
diff --git a/management/commands/resources/building5.jpg → ...nagement/commands/resources/building5.jpg b/management/commands/resources/building5.jpg → ...nagement/commands/resources/building5.jpg
diff --git a/management/commands/resources/building6.jpg → ...nagement/commands/resources/building6.jpg b/management/commands/resources/building6.jpg → ...nagement/commands/resources/building6.jpg
diff --git a/migrations/0001_initial.py → spotseeker_server/migrations/0001_initial.py b/migrations/0001_initial.py → spotseeker_server/migrations/0001_initial.py
diff --git a/migrations/0002_auto__add_spottype.py → ...ver/migrations/0002_auto__add_spottype.py b/migrations/0002_auto__add_spottype.py → ...ver/migrations/0002_auto__add_spottype.py
diff --git a/migrations/0003_populate_spottype.py → ...rver/migrations/0003_populate_spottype.py b/migrations/0003_populate_spottype.py → ...rver/migrations/0003_populate_spottype.py
diff --git a/...ns/0004_auto__del_field_spot_type_name.py → ...ns/0004_auto__del_field_spot_type_name.py b/...ns/0004_auto__del_field_spot_type_name.py → ...ns/0004_auto__del_field_spot_type_name.py
diff --git a/...ns/0005_move_description_extended_info.py → ...ns/0005_move_description_extended_info.py b/...ns/0005_move_description_extended_info.py → ...ns/0005_move_description_extended_info.py
diff --git a/.../0006_auto__del_field_spot_description.py → .../0006_auto__del_field_spot_description.py b/.../0006_auto__del_field_spot_description.py → .../0006_auto__del_field_spot_description.py
diff --git a/...07_description_to_location_description.py → ...07_description_to_location_description.py b/...07_description_to_location_description.py → ...07_description_to_location_description.py
diff --git a/...008_auto__add_field_spot_last_modified.py → ...008_auto__add_field_spot_last_modified.py b/...008_auto__add_field_spot_last_modified.py → ...008_auto__add_field_spot_last_modified.py
diff --git a/...auto__chg_field_spotextendedinfo_value.py → ...auto__chg_field_spotextendedinfo_value.py b/...auto__chg_field_spotextendedinfo_value.py → ...auto__chg_field_spotextendedinfo_value.py
diff --git a/.../0010_auto__add_field_spot_external_id.py → .../0010_auto__add_field_spot_external_id.py b/.../0010_auto__add_field_spot_external_id.py → .../0010_auto__add_field_spot_external_id.py
diff --git a/...__add_unique_spotextendedinfo_spot_key.py → ...__add_unique_spotextendedinfo_spot_key.py b/...__add_unique_spotextendedinfo_spot_key.py → ...__add_unique_spotextendedinfo_spot_key.py
diff --git a/...uto__add_field_spotimage_display_index.py → ...uto__add_field_spotimage_display_index.py b/...uto__add_field_spotimage_display_index.py → ...uto__add_field_spotimage_display_index.py
diff --git a/migrations/0013_init_image_display_index.py → ...grations/0013_init_image_display_index.py b/migrations/0013_init_image_display_index.py → ...grations/0013_init_image_display_index.py
diff --git a/migrations/0014_auto__add_favoritespot.py → ...migrations/0014_auto__add_favoritespot.py b/migrations/0014_auto__add_favoritespot.py → ...migrations/0014_auto__add_favoritespot.py
diff --git a/migrations/0015_auto__add_spacereview.py → .../migrations/0015_auto__add_spacereview.py b/migrations/0015_auto__add_spacereview.py → .../migrations/0015_auto__add_spacereview.py
diff --git a/...inal_review__add_field_spacereview_is_.py → ...inal_review__add_field_spacereview_is_.py b/...inal_review__add_field_spacereview_is_.py → ...inal_review__add_field_spacereview_is_.py
diff --git a/...authclient_bypasses_user_authorization.py → ...authclient_bypasses_user_authorization.py b/...authclient_bypasses_user_authorization.py → ...authclient_bypasses_user_authorization.py
diff --git a/...add_sharespacerecipient__add_sharespac.py → ...add_sharespacerecipient__add_sharespac.py b/...add_sharespacerecipient__add_sharespac.py → ...add_sharespacerecipient__add_sharespac.py
diff --git a/...del_sharespace__del_sharespacerecipien.py → ...del_sharespace__del_sharespacerecipien.py b/...del_sharespace__del_sharespacerecipien.py → ...del_sharespace__del_sharespacerecipien.py
diff --git a/migrations/__init__.py → spotseeker_server/migrations/__init__.py b/migrations/__init__.py → spotseeker_server/migrations/__init__.py
diff --git a/models.py → spotseeker_server/models.py b/models.py → spotseeker_server/models.py
diff --git a/org_filters/__init__.py → spotseeker_server/org_filters/__init__.py b/org_filters/__init__.py → spotseeker_server/org_filters/__init__.py
diff --git a/org_filters/sample_search.py → ...eeker_server/org_filters/sample_search.py b/org_filters/sample_search.py → ...eeker_server/org_filters/sample_search.py
diff --git a/org_filters/uw_search.py → spotseeker_server/org_filters/uw_search.py b/org_filters/uw_search.py → spotseeker_server/org_filters/uw_search.py
diff --git a/org_forms/__init__.py → spotseeker_server/org_forms/__init__.py b/org_forms/__init__.py → spotseeker_server/org_forms/__init__.py
diff --git a/org_forms/uiuc_spot.py → spotseeker_server/org_forms/uiuc_spot.py b/org_forms/uiuc_spot.py → spotseeker_server/org_forms/uiuc_spot.py
diff --git a/org_forms/uw_spot.py → spotseeker_server/org_forms/uw_spot.py b/org_forms/uw_spot.py → spotseeker_server/org_forms/uw_spot.py
diff --git a/require_auth.py → spotseeker_server/require_auth.py b/require_auth.py → spotseeker_server/require_auth.py
diff --git a/templates/404.html → spotseeker_server/templates/404.html b/templates/404.html → spotseeker_server/templates/404.html
diff --git a/templates/500.html → spotseeker_server/templates/500.html b/templates/500.html → spotseeker_server/templates/500.html
diff --git a/templates/email/share_space/html.html → ...ver/templates/email/share_space/html.html b/templates/email/share_space/html.html → ...ver/templates/email/share_space/html.html
diff --git a/templates/email/share_space/plain_text.txt → ...emplates/email/share_space/plain_text.txt b/templates/email/share_space/plain_text.txt → ...emplates/email/share_space/plain_text.txt
diff --git a/templates/email/share_space/subject.txt → ...r/templates/email/share_space/subject.txt b/templates/email/share_space/subject.txt → ...r/templates/email/share_space/subject.txt
diff --git a/templates/oauth/authorize.html → ...ker_server/templates/oauth/authorize.html b/templates/oauth/authorize.html → ...ker_server/templates/oauth/authorize.html
diff --git a/templates/oauth/declined.html → ...eker_server/templates/oauth/declined.html b/templates/oauth/declined.html → ...eker_server/templates/oauth/declined.html
diff --git a/templates/oauth/oob.html → spotseeker_server/templates/oauth/oob.html b/templates/oauth/oob.html → spotseeker_server/templates/oauth/oob.html
diff --git a/test/__init__.py → spotseeker_server/test/__init__.py b/test/__init__.py → spotseeker_server/test/__init__.py
diff --git a/test/auth/__init__.py → spotseeker_server/test/auth/__init__.py b/test/auth/__init__.py → spotseeker_server/test/auth/__init__.py
diff --git a/test/auth/all_ok.py → spotseeker_server/test/auth/all_ok.py b/test/auth/all_ok.py → spotseeker_server/test/auth/all_ok.py
diff --git a/test/auth/oauth.py → spotseeker_server/test/auth/oauth.py b/test/auth/oauth.py → spotseeker_server/test/auth/oauth.py
diff --git a/test/auth/oauth_logger.py → spotseeker_server/test/auth/oauth_logger.py b/test/auth/oauth_logger.py → spotseeker_server/test/auth/oauth_logger.py
diff --git a/test/buildings.py → spotseeker_server/test/buildings.py b/test/buildings.py → spotseeker_server/test/buildings.py
diff --git a/test/cache_test.py → spotseeker_server/test/cache_test.py b/test/cache_test.py → spotseeker_server/test/cache_test.py
diff --git a/test/favorite_model.py → spotseeker_server/test/favorite_model.py b/test/favorite_model.py → spotseeker_server/test/favorite_model.py
diff --git a/test/favorites.py → spotseeker_server/test/favorites.py b/test/favorites.py → spotseeker_server/test/favorites.py
diff --git a/test/hours/__init__.py → spotseeker_server/test/hours/__init__.py b/test/hours/__init__.py → spotseeker_server/test/hours/__init__.py
diff --git a/test/hours/get.py → spotseeker_server/test/hours/get.py b/test/hours/get.py → spotseeker_server/test/hours/get.py
diff --git a/test/hours/hours_range.py → spotseeker_server/test/hours/hours_range.py b/test/hours/hours_range.py → spotseeker_server/test/hours/hours_range.py
@@ -17,38 +17,36 @@
 from django.test import TestCase
 from django.test.client import Client
 from django.test.utils import override_settings
-from django.utils.unittest import skipIf
 from mock import patch
 from spotseeker_server import models
 import json
 import time
 
 
-# TODO: rather than skipping tests near midnight, mock datetime.now() to
-# return a consistent time.
 @override_settings(SPOTSEEKER_AUTH_MODULE='spotseeker_server.auth.all_ok')
-@skipIf(datetime.now().hour + 3 > 23 or datetime.now().hour < 3, "Skip open_at tests due to the time of day")
 class HoursRangeTest(TestCase):
     """ Tests searches for spots that are open anywhere within a range of hours.
     """
 
     def setUp(self):
-        self.now = datetime.now()
-        self.now = self.now - \
-            timedelta(seconds=self.now.second,
-                      microseconds=self.now.microsecond)
+        """ Creates a spot that is open between 10:00:00 and
+        13:00:00 on Wednesday.
+        """
+        self.now = datetime(16, 2, 3, 9, 0, 0)
         spot_open = datetime.time(self.now + timedelta(hours=1))
         spot_close = datetime.time(self.now + timedelta(hours=4))
 
-        self.spot1 = models.Spot.objects.create(name="Spot that opens at {0}:{1} and closes at {2}:{3}".format(
-            spot_open.hour, spot_open.minute, spot_close.hour, spot_close.minute))
+        self.spot1 = models.Spot.objects.create(
+            name="Spot that opens at {0}:{1} and closes at {2}:{3}".format(
+            spot_open.hour, spot_open.minute, spot_close.hour,
+                spot_close.minute))
 
         day_lookup = ["su", "m", "t", "w", "th", "f", "sa"]
-        day_num = int(time.strftime("%w", time.localtime()))
-        self.today = day_lookup[day_num]
+        self.today = day_lookup[3]
 
         models.SpotAvailableHours.objects.create(
-            spot=self.spot1, day=self.today, start_time=spot_open, end_time=spot_close)
+            spot=self.spot1, day=self.today, start_time=spot_open,
+                end_time=spot_close)
 
         self.day_dict = {"su": "Sunday",
                          "m": "Monday",
@@ -77,7 +75,8 @@ def test_open_within_range(self):
 
             client = Client()
             response = client.get(
-                "/api/v1/spot", {'fuzzy_hours_start': start_query, 'fuzzy_hours_end': end_query})
+                "/api/v1/spot", {'fuzzy_hours_start': start_query,
+                'fuzzy_hours_end': end_query})
             spots = json.loads(response.content)
 
             self.assertEqual(response.status_code, 200)
@@ -102,7 +101,8 @@ def test_closes_within_range(self):
 
             client = Client()
             response = client.get(
-                "/api/v1/spot", {'fuzzy_hours_start': start_query, 'fuzzy_hours_end': end_query})
+                "/api/v1/spot", {'fuzzy_hours_start': start_query,
+                'fuzzy_hours_end': end_query})
             spots = json.loads(response.content)
 
             self.assertEqual(response.status_code, 200)
@@ -128,7 +128,8 @@ def test_open_and_close_span_range(self):
 
             client = Client()
             response = client.get(
-                "/api/v1/spot", {'fuzzy_hours_start': start_query, 'fuzzy_hours_end': end_query})
+                "/api/v1/spot", {'fuzzy_hours_start': start_query,
+                'fuzzy_hours_end': end_query})
             spots = json.loads(response.content)
 
             self.assertEqual(response.status_code, 200)
@@ -145,8 +146,9 @@ def test_open_after_range_but_end_in_range(self):
             pass
 
     def test_open_within_range_but_end_outside(self):
-        """ Tests search for a spot that opens inside of the requested range but
-        closes outside of the requested range the next day (it spans midnight.)
+        """ Tests search for a spot that opens inside of the
+        requested range but closes outside of the requested
+        range the next day (it spans midnight.)
         This should return the spot.
         """
         dummy_cache = cache.get_cache(
@@ -164,15 +166,16 @@ def test_open_within_range_but_end_outside(self):
 
             client = Client()
             response = client.get(
-                "/api/v1/spot", {'fuzzy_hours_start': start_query, 'fuzzy_hours_end': end_query})
+                "/api/v1/spot", {'fuzzy_hours_start': start_query,
+                'fuzzy_hours_end': end_query})
             spots = json.loads(response.content)
 
             self.assertEqual(response.status_code, 200)
             self.assertTrue(self.spot1.json_data_structure() in spots)
 
     def test_open_close_in_range(self):
-        """ Tests search for a spot that opens and closes within the requested
-        hours range.
+        """ Tests search for a spot that opens and closes within the
+        requested hours range.
         This should return the spot.
         """
         dummy_cache = cache.get_cache(
@@ -190,15 +193,16 @@ def test_open_close_in_range(self):
 
             client = Client()
             response = client.get(
-                "/api/v1/spot", {'fuzzy_hours_start': start_query, 'fuzzy_hours_end': end_query})
+                "/api/v1/spot", {'fuzzy_hours_start': start_query,
+                'fuzzy_hours_end': end_query})
             spots = json.loads(response.content)
 
             self.assertEqual(response.status_code, 200)
             self.assertTrue(self.spot1.json_data_structure() in spots)
 
     def test_start_within_range_and_end_within_range_next_day(self):
-        """ Tests search for a spot that opens within the requested range and
-        closes within the requested range the next day.
+        """ Tests search for a spot that opens within the requested range
+        and closes within the requested range the next day.
         This should return the spot.
         """
         dummy_cache = cache.get_cache(
@@ -207,8 +211,8 @@ def test_start_within_range_and_end_within_range_next_day(self):
             pass
 
     def test_start_end_before_range(self):
-        """ Tests search for a spot that opens and closes before the requested
-        range.
+        """ Tests search for a spot that opens and closes before the
+        requested range.
         This should NOT return the spot.
         """
         dummy_cache = cache.get_cache(
@@ -226,7 +230,8 @@ def test_start_end_before_range(self):
 
             client = Client()
             response = client.get(
-                "/api/v1/spot", {'fuzzy_hours_start': start_query, 'fuzzy_hours_end': end_query})
+                "/api/v1/spot", {'fuzzy_hours_start': start_query,
+                'fuzzy_hours_end': end_query})
             spots = json.loads(response.content)
 
             self.assertEqual(response.status_code, 200)
@@ -252,7 +257,8 @@ def test_start_end_after_range(self):
 
             client = Client()
             response = client.get(
-                "/api/v1/spot", {'fuzzy_hours_start': start_query, 'fuzzy_hours_end': end_query})
+                "/api/v1/spot", {'fuzzy_hours_start': start_query,
+                'fuzzy_hours_end': end_query})
             spots = json.loads(response.content)
 
             self.assertEqual(response.status_code, 200)
@@ -297,7 +303,8 @@ def test_invalid_start_only(self):
             self.assertEqual(response.status_code, 400)
 
     def test_closes_at_start(self):
-        """ Tests search for a spot that closes at exactly the time the search range begins.
+        """ Tests search for a spot that closes at exactly the time the
+        search range begins.
         This should NOT return the spot.
         """
         dummy_cache = cache.get_cache(
@@ -315,14 +322,16 @@ def test_closes_at_start(self):
 
             client = Client()
             response = client.get(
-                "/api/v1/spot", {'fuzzy_hours_start': start_query, 'fuzzy_hours_end': end_query})
+                "/api/v1/spot", {'fuzzy_hours_start': start_query,
+                'fuzzy_hours_end': end_query})
             spots = json.loads(response.content)
 
             self.assertEqual(response.status_code, 200)
             self.assertFalse(self.spot1.json_data_structure() in spots)
 
     def test_opens_at_end(self):
-        """ Tests search for a spot that opens at exactly the time the search range ends.
+        """ Tests search for a spot that opens at exactly the time
+        the search range ends.
         This should NOT return the spot.
         """
         dummy_cache = cache.get_cache(
@@ -340,7 +349,8 @@ def test_opens_at_end(self):
 
             client = Client()
             response = client.get(
-                "/api/v1/spot", {'fuzzy_hours_start': start_query, 'fuzzy_hours_end': end_query})
+                "/api/v1/spot", {'fuzzy_hours_start': start_query,
+                'fuzzy_hours_end': end_query})
             spots = json.loads(response.content)
 
             self.assertEqual(response.status_code, 200)

diff --git a/test/hours/model.py → spotseeker_server/test/hours/model.py b/test/hours/model.py → spotseeker_server/test/hours/model.py
diff --git a/test/hours/modify.py → spotseeker_server/test/hours/modify.py b/test/hours/modify.py → spotseeker_server/test/hours/modify.py
diff --git a/test/hours/open_at.py → spotseeker_server/test/hours/open_at.py b/test/hours/open_at.py → spotseeker_server/test/hours/open_at.py
@@ -16,40 +16,49 @@
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.test.client import Client
-from django.utils.unittest import skipIf
 import simplejson as json
 from datetime import datetime, timedelta
 import time
 from django.test.utils import override_settings
 from mock import patch
 from django.core import cache
 from spotseeker_server import models
+import mock
 
 
 @override_settings(SPOTSEEKER_AUTH_MODULE='spotseeker_server.auth.all_ok')
 class SpotHoursOpenAtTest(TestCase):
     """ Tests search requests for spots that are open at a particular time.
     """
 
-    @skipIf(datetime.now().hour + 3 > 23 or datetime.now().hour < 3, "Skip open_at tests due to the time of day")
-    def test_open_at(self):
-        dummy_cache = cache.get_cache('django.core.cache.backends.dummy.DummyCache')
+    @mock.patch('spotseeker_server.views.search.SearchView.get_datetime')
+    def test_open_at(self, datetime_mock):
+        dummy_cache = cache.get_cache(
+            'django.core.cache.backends.dummy.DummyCache')
         with patch.object(models, 'cache', dummy_cache):
             # Create a spot that isn't open now but will be in an hour.
             spot = models.Spot.objects.create(name="This spot is open later")
-            now = datetime.now()
+            #Setting now to be Wednesday 9:00:00
+            now = datetime(16, 2, 3, 9, 0, 0)
             spot_open = datetime.time(now + timedelta(hours=1))
             spot_close = datetime.time(now + timedelta(hours=3))
 
             day_lookup = ["su", "m", "t", "w", "th", "f", "sa"]
-            day_num = int(time.strftime("%w", time.localtime()))
-            today = day_lookup[day_num]
+            today = day_lookup[3]
 
-            models.SpotAvailableHours.objects.create(spot=spot, day=today, start_time=spot_open, end_time=spot_close)
+            models.SpotAvailableHours.objects.create(spot=spot,
+                day=today,
+                start_time=spot_open,
+                end_time=spot_close)
+
+            # Mock the call to now() so that the time returned
+            # is always 9:00:00
+            datetime_mock.return_value = ('w',
+                datetime(16, 2, 3, 9, 0, 0).time())
 
             # Verify the spot is closed now
-            c = Client()
-            response = c.get("/api/v1/spot", {'open_now': True})
+            client = Client()
+            response = client.get("/api/v1/spot", {'open_now': True})
             spots = json.loads(response.content)
 
             spot_returned = False
@@ -58,7 +67,8 @@ def test_open_at(self):
                 if s['id'] == spot.pk:
                     spot_returned = True
 
-            self.assertTrue(not spot_returned, "The spot that is open later is not in the spots open now")
+            self.assertTrue(not spot_returned,
+                "The spot that is open later is not in the spots open now")
 
             # Test the spot that is open later
             query_time = datetime.time(now + timedelta(hours=2))
@@ -73,7 +83,7 @@ def test_open_at(self):
             query_day = day_dict[today]
             query = "%s,%s" % (query_day, query_time)
 
-            response = c.get("/api/v1/spot", {'open_at': query})
+            response = client.get("/api/v1/spot", {'open_at': query})
             spots = json.loads(response.content)
 
             spot_returned = False
@@ -84,10 +94,11 @@ def test_open_at(self):
 
             self.assertTrue(spot_returned, "Got the spot that is open later")
 
-            # Test that the spot is not returned if we search for open_at == spot_close
+            # Test that the spot is not returned if we search
+            # for open_at == spot_close
             query = "%s,%s" % (query_day, spot_close)
 
-            response = c.get("/api/v1/spot", {'open_at': query})
+            response = client.get("/api/v1/spot", {'open_at': query})
             spots = json.loads(response.content)
 
             spot_returned = False
@@ -96,4 +107,5 @@ def test_open_at(self):
                 if s['id'] == spot.pk:
                     spot_returned = True
 
-            self.assertTrue(not spot_returned, "The spot that closes at search time is not returned.")
+            self.assertTrue(not spot_returned,
+                "The spot that closes at search time is not returned.")