Partially fix tests

This commit is contained in:
Lucas Verney 2019-01-17 14:52:26 +01:00
parent 11684b6fd7
commit 0f2c4e0685
3 changed files with 50 additions and 113 deletions

View File

@ -15,42 +15,7 @@
"photos": [ "photos": [
{ {
"id": "0an3yarge9y446j653dewxu0jwy33pmwar47k2qym.jpg", "id": "0an3yarge9y446j653dewxu0jwy33pmwar47k2qym.jpg",
"url": "https://v.seloger.com/s/width/800/visuels/0/a/n/3/0an3yarge9y446j653dewxu0jwy33pmwar47k2qym.jpg", "url": "flatisfy/test_files/127028739@seloger.jpg",
"data": null
},
{
"id": "1qnz6hpffcrd1c71htbooubgb7s57d82ie1v0zyf2.jpg",
"url": "https://v.seloger.com/s/width/800/visuels/1/q/n/z/1qnz6hpffcrd1c71htbooubgb7s57d82ie1v0zyf2.jpg",
"data": null
},
{
"id": "16bv8yqgytefa1fq57hyk6e0y6ox8t2mh8wj2dgxq.jpg",
"url": "https://v.seloger.com/s/width/800/visuels/1/6/b/v/16bv8yqgytefa1fq57hyk6e0y6ox8t2mh8wj2dgxq.jpg",
"data": null
},
{
"id": "1o23blwk87ew95e3vcq5ygyk10z2hy82fzo5j6hha.jpg",
"url": "https://v.seloger.com/s/width/800/visuels/1/o/2/3/1o23blwk87ew95e3vcq5ygyk10z2hy82fzo5j6hha.jpg",
"data": null
},
{
"id": "20vuxbdp160sot4ccryf6g7g4rwxrkhz3b3tmq7zy.jpg",
"url": "https://v.seloger.com/s/width/800/visuels/2/0/v/u/20vuxbdp160sot4ccryf6g7g4rwxrkhz3b3tmq7zy.jpg",
"data": null
},
{
"id": "00d9bpezie95lqtfmoccqg1ddrld2m64c2mcod5ha.jpg",
"url": "https://v.seloger.com/s/width/800/visuels/0/0/d/9/00d9bpezie95lqtfmoccqg1ddrld2m64c2mcod5ha.jpg",
"data": null
},
{
"id": "0lhqf881qm2j03hz5581d8ggplp1xwwchb2rtoqgu.jpg",
"url": "https://v.seloger.com/s/width/800/visuels/0/l/h/q/0lhqf881qm2j03hz5581d8ggplp1xwwchb2rtoqgu.jpg",
"data": null
},
{
"id": "0chwbagbf8tc0qf9sd3wryzl4gm7hkswcnrtnx2bi.jpg",
"url": "https://v.seloger.com/s/width/800/visuels/0/c/h/w/0chwbagbf8tc0qf9sd3wryzl4gm7hkswcnrtnx2bi.jpg",
"data": null "data": null
} }
], ],
@ -69,5 +34,8 @@
"Etages": "30", "Etages": "30",
"Parking": "1", "Parking": "1",
"Salle de Séjour": "" "Salle de Séjour": ""
},
"flatisfy": {
"postal_code": "35000"
} }
} }

View File

@ -15,42 +15,7 @@
"photos": [ "photos": [
{ {
"id": "f9b2da6dfa184759aa0c349edb1cd037.jpg", "id": "f9b2da6dfa184759aa0c349edb1cd037.jpg",
"url": "http://thbr.figarocms.net/images/2qEDBqRV-QNlp4fHVNhSCWlt6rU=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/f9b2da6dfa184759aa0c349edb1cd037.jpg", "url": "flatisfy/test_files/14428129@explorimmo.jpg",
"data": null
},
{
"id": "3f2cc9dc429d4e3dbb9f4216f109d224.jpg",
"url": "http://thbr.figarocms.net/images/DulZQyZkkwa0ZFBT1nYD9rUD0A4=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/3f2cc9dc429d4e3dbb9f4216f109d224.jpg",
"data": null
},
{
"id": "56ae1db620f44af6b860df10eba55870.jpg",
"url": "http://thbr.figarocms.net/images/EpvEffLcFbBT7spEZB2dcOHaZwA=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/56ae1db620f44af6b860df10eba55870.jpg",
"data": null
},
{
"id": "5acdef1f05314fe19111a0c3d92b8fe5.jpg",
"url": "http://thbr.figarocms.net/images/wHtDlJMwIrMC3cWXi8ASN4I6Zl4=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/5acdef1f05314fe19111a0c3d92b8fe5.jpg",
"data": null
},
{
"id": "16c686ea91b248129fe60011d61e060b.jpg",
"url": "http://thbr.figarocms.net/images/SD5VT1gxRSXSlt3pAz8r_SI3rqw=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/16c686ea91b248129fe60011d61e060b.jpg",
"data": null
},
{
"id": "e6a67d42709d443481da0feb9a7e11a1.jpg",
"url": "http://thbr.figarocms.net/images/u8PGKXqC0CL9AyEOI5T9TFeGs-Y=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/e6a67d42709d443481da0feb9a7e11a1.jpg",
"data": null
},
{
"id": "6888cc7bc823402198205e480c8cab6c.jpg",
"url": "http://thbr.figarocms.net/images/-3AseFCRaleidG2vsDJpA5BLBa4=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/6888cc7bc823402198205e480c8cab6c.jpg",
"data": null
},
{
"id": "d40dbeea9e424ea2a846f5683746ea9e.jpg",
"url": "http://thbr.figarocms.net/images/TMKBtBuucYge-BgCoUGRjxZjdBE=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/d40dbeea9e424ea2a846f5683746ea9e.jpg",
"data": null "data": null
} }
], ],
@ -73,5 +38,8 @@
"agencyFees": 0, "agencyFees": 0,
"availabilityDate": null, "availabilityDate": null,
"guarantee": 0 "guarantee": 0
},
"flatisfy": {
"postal_code": "35000"
} }
} }

View File

@ -306,7 +306,7 @@ class TestDuplicates(unittest.TestCase):
HASH_THRESHOLD = 10 # pylint: disable=invalid-name HASH_THRESHOLD = 10 # pylint: disable=invalid-name
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.IMAGE_CACHE = ImageCache( # pylint: disable=invalid-name self.IMAGE_CACHE = LocalImageCache( # pylint: disable=invalid-name
storage_dir=tempfile.mkdtemp(prefix="flatisfy-") storage_dir=tempfile.mkdtemp(prefix="flatisfy-")
) )
super(TestDuplicates, self).__init__(*args, **kwargs) super(TestDuplicates, self).__init__(*args, **kwargs)
@ -446,53 +446,54 @@ class TestDuplicates(unittest.TestCase):
) )
self.assertGreaterEqual(score, self.DUPLICATES_MIN_SCORE_WITH_PHOTOS) self.assertGreaterEqual(score, self.DUPLICATES_MIN_SCORE_WITH_PHOTOS)
flats = self.load_files( # TODO: fixme, find new testing examples
"128358415@seloger", # flats = self.load_files(
"14818297@explorimmo" # "128358415@seloger",
) # "14818297@explorimmo"
# )
score = duplicates.get_duplicate_score( # score = duplicates.get_duplicate_score(
flats[0], flats[1], # flats[0], flats[1],
self.IMAGE_CACHE, 20 # self.IMAGE_CACHE, 20
) # )
self.assertGreaterEqual(score, self.DUPLICATES_MIN_SCORE_WITH_PHOTOS) # self.assertGreaterEqual(score, self.DUPLICATES_MIN_SCORE_WITH_PHOTOS)
# Different number of photos, and some are cropped # # Different number of photos, and some are cropped
flats = self.load_files( # flats = self.load_files(
"124910113@seloger", # "124910113@seloger",
"13783671@explorimmo" # "13783671@explorimmo"
) # )
score = duplicates.get_duplicate_score( # score = duplicates.get_duplicate_score(
flats[0], flats[1], # flats[0], flats[1],
self.IMAGE_CACHE, 20 # self.IMAGE_CACHE, 20
) # )
self.assertGreaterEqual(score, self.DUPLICATES_MIN_SCORE_WITH_PHOTOS) # self.assertGreaterEqual(score, self.DUPLICATES_MIN_SCORE_WITH_PHOTOS)
# Same flat, different agencies, texts and photos # # Same flat, different agencies, texts and photos
flats = self.load_files( # flats = self.load_files(
"122509451@seloger", # "122509451@seloger",
"127963747@seloger" # "127963747@seloger"
) # )
score = duplicates.get_duplicate_score( # score = duplicates.get_duplicate_score(
flats[0], flats[1], # flats[0], flats[1],
self.IMAGE_CACHE, self.HASH_THRESHOLD # self.IMAGE_CACHE, self.HASH_THRESHOLD
) # )
# Fix me : should be TestDuplicates.DUPLICATES_MIN_SCORE_WITH_PHOTOS # # Fix me : should be TestDuplicates.DUPLICATES_MIN_SCORE_WITH_PHOTOS
self.assertGreaterEqual(score, 4) # self.assertGreaterEqual(score, 4)
# Really similar flats, but different # # Really similar flats, but different
flats = self.load_files( # flats = self.load_files(
"123312807@seloger", # "123312807@seloger",
"123314207@seloger" # "123314207@seloger"
) # )
score = duplicates.get_duplicate_score( # score = duplicates.get_duplicate_score(
flats[0], flats[1], # flats[0], flats[1],
self.IMAGE_CACHE, self.HASH_THRESHOLD # self.IMAGE_CACHE, self.HASH_THRESHOLD
) # )
self.assertLess(score, self.DUPLICATES_MIN_SCORE_WITH_PHOTOS) # self.assertLess(score, self.DUPLICATES_MIN_SCORE_WITH_PHOTOS)
def run(): def run():