archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Renamed some test_xxx files to common_test_xxx.py

Browse Source 
Those files contain stuff for tests, but don't contain tests themselves.
This commit is contained in:
Sybren A. Stüvel
2016-03-25 16:05:36 +01:00
parent adb4f5b39e
commit d7ee2121d9
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test_file_caching.py
View File

@@ -4,7 +4,7 @@ import bson.tz_util
import datetime
from eve import RFC1123_DATE_FORMAT
from common_test_stuff import AbstractPillarTest
from common_test_class import AbstractPillarTest
class FileCachingTest(AbstractPillarTest):
@@ -15,7 +15,7 @@ class FileCachingTest(AbstractPillarTest):
self.assertEqual(404, resp.status_code)
def test_existing_file(self):
file_id, _ = self._ensure_file_exists()
file_id, _ = self.ensure_file_exists()
resp = self.client.get('/files/%s' % file_id)
self.assertEqual(200, resp.status_code)
@@ -24,7 +24,7 @@ class FileCachingTest(AbstractPillarTest):
with self.app.test_request_context():
# Make sure the file link has not expired.
expires = datetime.datetime.now(tz=bson.tz_util.utc) + datetime.timedelta(minutes=1)
file_id, file_doc = self._ensure_file_exists(file_overrides={
file_id, file_doc = self.ensure_file_exists(file_overrides={
u'link_expires': expires
})
@@ -34,7 +34,7 @@ class FileCachingTest(AbstractPillarTest):
self.assertEqual(304, resp.status_code)
def test_if_modified_200(self):
file_id, file_doc = self._ensure_file_exists()
file_id, file_doc = self.ensure_file_exists()
delta = datetime.timedelta(days=-1)
@@ -48,7 +48,7 @@ class FileCachingTest(AbstractPillarTest):
with self.app.test_request_context():
# Make sure the file link has expired.
expires = datetime.datetime.now(tz=bson.tz_util.utc) - datetime.timedelta(seconds=1)
file_id, file_doc = self._ensure_file_exists(file_overrides={
file_id, file_doc = self.ensure_file_exists(file_overrides={
u'link_expires': expires
})