Page MenuHomeSoftware Heritage
Differential D671

tests: Add Ctags Indexer tests
ClosedPublic
Actions

Authored by ardumont on Nov 17 2018, 9:48 AM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Commits
rDCIDX957238328c8e: tests: Add Ctags Indexer tests
rDCIDXe64de8801f5a: tests: Add missing test scenarii for wrongly initialized indexers
Summary

Also add missing test scenarii for wrongly initialized indexers.

Depends on D670

Test Plan

tox

Diff Detail

Repository
rDCIDX Metadata indexer
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ardumont created this revision.Nov 17 2018, 9:48 AM
Harbormaster failed remote builds in B2438: Diff 2113!Nov 17 2018, 9:48 AM
swh-public-ci added a subscriber: swh-public-ci.Nov 17 2018, 9:48 AM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DCIDX/job/tox/51/
See console output for more information: https://jenkins.softwareheritage.org/job/DCIDX/job/tox/51/console

ardumont added a comment.Nov 17 2018, 9:51 AM

Build has FAILED

because stacked diff does not build yet.

vlorentz requested changes to this revision.Nov 17 2018, 1:32 PM
vlorentz added inline comments.
swh/indexer/tests/test_ctags.py
35–58 ↗(On Diff #2113)

same comment as on D670

68–93 ↗(On Diff #2113)

same

This revision now requires changes to proceed.Nov 17 2018, 1:32 PM
ardumont added a comment.Nov 17 2018, 2:43 PM

While i appreciate you taking your time off to answer immediately (that was for monday ;)...
Like i said in D670, the require change directly without discussion possible i do not... (i disagree with your remarks in the previous diffs but that comes too late now).
That's focusing way too much on the negative sides instead of the positive ones (fixing coverage to ease maintenance, avoiding duplication for the next one).

In general, I think we need to discuss that (as a team).

Also, in that case, the urgency is to deploy the new indexers to fix that part of the production...
(which has been broken since i tried to deploy the metadata indexers, around at least 1 week already).

Cheers,

vlorentz accepted this revision.Nov 17 2018, 8:00 PM
This revision is now accepted and ready to land.Nov 17 2018, 8:00 PM
Closed by commit rDCIDXe64de8801f5a: tests: Add missing test scenarii for wrongly initialized indexers (authored by ardumont). · Explain WhyNov 19 2018, 9:52 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
swh/
indexer/
tests/
38 lines
14 lines
37 lines
28 lines

Diff 2117

View Options

swh/indexer/tests/test_fossology_license.py

# Copyright (C) 2017-2018 The Software Heritage developers # Copyright (C) 2017-2018 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution # See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version # License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information # See top-level LICENSE file for more information
import unittest import unittest
import logging import logging
from swh.indexer.fossology_license import ( from swh.indexer.fossology_license import (
ContentFossologyLicenseIndexer, FossologyLicenseRangeIndexer ContentFossologyLicenseIndexer, FossologyLicenseRangeIndexer
) )
from swh.indexer.tests.test_utils import ( from swh.indexer.tests.test_utils import (
MockObjStorage, BasicMockStorage, BasicMockIndexerStorage, MockObjStorage, BasicMockStorage, BasicMockIndexerStorage,
SHA1_TO_LICENSES, CommonContentIndexerTest, CommonContentIndexerRangeTest SHA1_TO_LICENSES, CommonContentIndexerTest, CommonContentIndexerRangeTest,
CommonIndexerWithErrorsTest, CommonIndexerNoTool
) )
class NoDiskIndexer: class NoDiskIndexer:
"""Mixin to override the DiskIndexer behavior avoiding side-effects in """Mixin to override the DiskIndexer behavior avoiding side-effects in
tests. tests.
""" """
Show All 36 Lines def prepare(self):
} }
self.idx_storage = BasicMockIndexerStorage() self.idx_storage = BasicMockIndexerStorage()
self.log = logging.getLogger('swh.indexer') self.log = logging.getLogger('swh.indexer')
self.objstorage = MockObjStorage() self.objstorage = MockObjStorage()
self.tools = self.register_tools(self.config['tools']) self.tools = self.register_tools(self.config['tools'])
self.tool = self.tools[0] self.tool = self.tools[0]
class FossologyLicenseIndexerUnknownToolTestStorage(
FossologyLicenseTestIndexer):
"""Specific fossology license indexer whose configuration is not
enough to satisfy the indexing checks
"""
def prepare(self):
super().prepare()
self.tools = None
class TestFossologyLicenseIndexerWithErrors(unittest.TestCase):
def test_wrong_unknown_configuration_tool(self):
"""Indexer with unknown configuration tool should fail the check"""
with self.assertRaisesRegex(ValueError, 'Tools None is unknown'):
FossologyLicenseIndexerUnknownToolTestStorage()
class TestFossologyLicenseIndexer(CommonContentIndexerTest, unittest.TestCase): class TestFossologyLicenseIndexer(CommonContentIndexerTest, unittest.TestCase):
"""Language indexer test scenarios: """Language indexer test scenarios:
- Known sha1s in the input list have their data indexed - Known sha1s in the input list have their data indexed
- Unknown sha1 in the input list are not indexed - Unknown sha1 in the input list are not indexed
""" """
def setUp(self): def setUp(self):
▲ Show 20 Lines • Show All 82 Lines • ▼ Show 20 Lines def setUp(self):
'licenses': SHA1_TO_LICENSES[self.id1] 'licenses': SHA1_TO_LICENSES[self.id1]
}, },
self.id2: { self.id2: {
'id': self.id2, 'id': self.id2,
'indexer_configuration_id': 10, 'indexer_configuration_id': 10,
'licenses': SHA1_TO_LICENSES[self.id2] 'licenses': SHA1_TO_LICENSES[self.id2]
} }
} }
class FossologyLicenseIndexerUnknownToolTestStorage(
CommonIndexerNoTool, FossologyLicenseTestIndexer):
"""Fossology license indexer with wrong configuration"""
class FossologyLicenseRangeIndexerUnknownToolTestStorage(
CommonIndexerNoTool, FossologyLicenseRangeIndexerTest):
"""Fossology license range indexer with wrong configuration"""
class TestFossologyLicenseIndexersErrors(
CommonIndexerWithErrorsTest, unittest.TestCase):
"""Test the indexer raise the right errors when wrongly initialized"""
Indexer = FossologyLicenseIndexerUnknownToolTestStorage
RangeIndexer = FossologyLicenseRangeIndexerUnknownToolTestStorage
View Options

swh/indexer/tests/test_language.py

# Copyright (C) 2017-2018 The Software Heritage developers # Copyright (C) 2017-2018 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution # See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version # License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information # See top-level LICENSE file for more information
import unittest import unittest
import logging import logging
from swh.indexer import language from swh.indexer import language
from swh.indexer.language import ContentLanguageIndexer from swh.indexer.language import ContentLanguageIndexer
from swh.indexer.tests.test_utils import ( from swh.indexer.tests.test_utils import (
BasicMockIndexerStorage, MockObjStorage, CommonContentIndexerTest BasicMockIndexerStorage, MockObjStorage, CommonContentIndexerTest,
CommonIndexerWithErrorsTest, CommonIndexerNoTool
) )
class LanguageTestIndexer(ContentLanguageIndexer): class LanguageTestIndexer(ContentLanguageIndexer):
"""Specific language whose configuration is enough to satisfy the """Specific language whose configuration is enough to satisfy the
indexing tests. indexing tests.
""" """
def prepare(self): def prepare(self):
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Lines def setUp(self):
'lang': 'c' 'lang': 'c'
}, },
self.id2: { self.id2: {
'id': self.id2, 'id': self.id2,
'indexer_configuration_id': 10, 'indexer_configuration_id': 10,
'lang': 'text-only' 'lang': 'text-only'
} }
} }
class LanguageIndexerUnknownToolTestStorage(
CommonIndexerNoTool, LanguageTestIndexer):
"""Fossology license indexer with wrong configuration"""
class TestLanguageIndexersErrors(
CommonIndexerWithErrorsTest, unittest.TestCase):
"""Test the indexer raise the right errors when wrongly initialized"""
Indexer = LanguageIndexerUnknownToolTestStorage
View Options

swh/indexer/tests/test_mimetype.py

# Copyright (C) 2017-2018 The Software Heritage developers # Copyright (C) 2017-2018 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution # See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version # License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information # See top-level LICENSE file for more information
import unittest import unittest
import logging import logging
from swh.indexer.mimetype import ( from swh.indexer.mimetype import (
ContentMimetypeIndexer, MimetypeRangeIndexer ContentMimetypeIndexer, MimetypeRangeIndexer
) )
from swh.indexer.tests.test_utils import ( from swh.indexer.tests.test_utils import (
MockObjStorage, BasicMockStorage, BasicMockIndexerStorage, MockObjStorage, BasicMockStorage, BasicMockIndexerStorage,
CommonContentIndexerTest, CommonContentIndexerRangeTest CommonContentIndexerTest, CommonContentIndexerRangeTest,
CommonIndexerWithErrorsTest, CommonIndexerNoTool
) )
class MimetypeTestIndexer(ContentMimetypeIndexer): class MimetypeTestIndexer(ContentMimetypeIndexer):
"""Specific mimetype indexer instance whose configuration is enough to """Specific mimetype indexer instance whose configuration is enough to
satisfy the indexing tests. satisfy the indexing tests.
""" """
Show All 10 Lines def prepare(self):
} }
self.idx_storage = BasicMockIndexerStorage() self.idx_storage = BasicMockIndexerStorage()
self.log = logging.getLogger('swh.indexer') self.log = logging.getLogger('swh.indexer')
self.objstorage = MockObjStorage() self.objstorage = MockObjStorage()
self.tools = self.register_tools(self.config['tools']) self.tools = self.register_tools(self.config['tools'])
self.tool = self.tools[0] self.tool = self.tools[0]
class MimetypeIndexerUnknownToolTestStorage(MimetypeTestIndexer):
"""Specific mimetype whose configuration is not enough to satisfy the
indexing checks.
"""
def prepare(self):
super().prepare()
self.tools = None
class TestMimetypeIndexerWithErrors(unittest.TestCase):
def test_wrong_unknown_configuration_tool(self):
"""Indexer with unknown configuration tool should fail the check"""
with self.assertRaisesRegex(ValueError, 'Tools None is unknown'):
MimetypeIndexerUnknownToolTestStorage()
class TestMimetypeIndexer(CommonContentIndexerTest, unittest.TestCase): class TestMimetypeIndexer(CommonContentIndexerTest, unittest.TestCase):
"""Mimetype indexer test scenarios: """Mimetype indexer test scenarios:
- Known sha1s in the input list have their data indexed - Known sha1s in the input list have their data indexed
- Unknown sha1 in the input list are not indexed - Unknown sha1 in the input list are not indexed
""" """
def setUp(self): def setUp(self):
▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Lines def setUp(self):
'indexer_configuration_id': 10, 'indexer_configuration_id': 10,
'mimetype': b'text/x-python'}, 'mimetype': b'text/x-python'},
self.id2: { self.id2: {
'encoding': b'us-ascii', 'encoding': b'us-ascii',
'id': self.id2, 'id': self.id2,
'indexer_configuration_id': 10, 'indexer_configuration_id': 10,
'mimetype': b'text/plain'} 'mimetype': b'text/plain'}
} }
class MimetypeIndexerUnknownToolTestStorage(
CommonIndexerNoTool, MimetypeTestIndexer):
"""Fossology license indexer with wrong configuration"""
class MimetypeRangeIndexerUnknownToolTestStorage(
CommonIndexerNoTool, MimetypeRangeIndexerTest):
"""Fossology license range indexer with wrong configuration"""
class TestMimetypeIndexersErrors(
CommonIndexerWithErrorsTest, unittest.TestCase):
"""Test the indexer raise the right errors when wrongly initialized"""
Indexer = MimetypeIndexerUnknownToolTestStorage
RangeIndexer = MimetypeRangeIndexerUnknownToolTestStorage
View Options

swh/indexer/tests/test_utils.py

# Copyright (C) 2017-2018 The Software Heritage developers # Copyright (C) 2017-2018 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution # See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version # License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information # See top-level LICENSE file for more information
import unittest
from swh.objstorage.exc import ObjNotFoundError from swh.objstorage.exc import ObjNotFoundError
from swh.model import hashutil from swh.model import hashutil
ORIGINS = [ ORIGINS = [
{ {
'id': 52189575, 'id': 52189575,
'lister': None, 'lister': None,
▲ Show 20 Lines • Show All 499 Lines • ▼ Show 20 Lines def content_fossology_license_get_range(
start, end, indexer_configuration_id, limit=limit) start, end, indexer_configuration_id, limit=limit)
def indexer_configuration_add(self, tools): def indexer_configuration_add(self, tools):
return [{ return [{
'id': 10, 'id': 10,
}] }]
class CommonIndexerNoTool:
"""Mixin to wronly initialize content indexer"""
def prepare(self):
super().prepare()
self.tools = None
class CommonIndexerWithErrorsTest:
"""Test indexer configuration checks.
"""
Indexer = None
RangeIndexer = None
def test_wrong_unknown_configuration_tool(self):
"""Indexer with unknown configuration tool fails check"""
with self.assertRaisesRegex(ValueError, 'Tools None is unknown'):
print('indexer: %s' % self.Indexer)
self.Indexer()
def test_wrong_unknown_configuration_tool_range(self):
"""Range Indexer with unknown configuration tool fails check"""
if self.RangeIndexer is not None:
with self.assertRaisesRegex(ValueError, 'Tools None is unknown'):
self.RangeIndexer()
class CommonContentIndexerTest: class CommonContentIndexerTest:
def assert_results_ok(self, actual_results, expected_results=None): def assert_results_ok(self, actual_results, expected_results=None):
if expected_results is None: if expected_results is None:
expected_results = self.expected_results expected_results = self.expected_results
for indexed_data in actual_results: for indexed_data in actual_results:
_id = indexed_data['id'] _id = indexed_data['id']
self.assertEqual(indexed_data, expected_results[_id]) self.assertEqual(indexed_data, expected_results[_id])
▲ Show 20 Lines • Show All 123 Lines • Show Last 20 Lines
About · Developer information · Legal