Page MenuHomeSoftware Heritage
Files F9342297

No OneTemporary
Actions

View Options

diff --git a/swh/loader/svn/tests/test_base.py b/swh/loader/svn/tests/test_base.py
new file mode 100644
index 0000000..6e62bb9
--- /dev/null
+++ b/swh/loader/svn/tests/test_base.py
@@ -0,0 +1,70 @@
+# Copyright (C) 2016 The Software Heritage developers
+# See the AUTHORS file at the top-level directory of this distribution
+# License: GNU General Public License version 3, or any later version
+# See top-level LICENSE file for more information
+
+import os
+import shutil
+import subprocess
+import tempfile
+import unittest
+
+
+PATH_TO_DATA = '../../../../..'
+
+
+class BaseTestSvnLoader(unittest.TestCase):
+ """Base test loader class.
+
+ In its setup, it's uncompressing a local svn mirror to /tmp.
+
+ """
+ def setUp(self, archive_name='pkg-gourmet.tgz', filename='pkg-gourmet'):
+ self.tmp_root_path = tempfile.mkdtemp()
+
+ start_path = os.path.dirname(__file__)
+ svn_mirror_repo = os.path.join(start_path,
+ PATH_TO_DATA,
+ 'swh-storage-testdata',
+ 'svn-folders',
+ archive_name)
+
+ # uncompress the sample folder
+ subprocess.check_output(
+ ['tar', 'xvf', svn_mirror_repo, '-C', self.tmp_root_path],
+ )
+
+ self.svn_mirror_url = 'file://' + self.tmp_root_path + '/' + filename
+ self.destination_path = os.path.join(
+ self.tmp_root_path, 'working-copy')
+
+ def tearDown(self):
+ shutil.rmtree(self.tmp_root_path)
+
+
+class BaseTestTreeLoader(unittest.TestCase):
+ """Root class to ease walk and git hash testing without side-effecty
+ problems.
+
+ """
+ def setUp(self):
+ super().setUp()
+ self.tmp_root_path = tempfile.mkdtemp()
+ self.maxDiff = None
+
+ start_path = os.path.dirname(__file__)
+ sample_folder = os.path.join(start_path,
+ PATH_TO_DATA,
+ 'swh-storage-testdata',
+ 'dir-folders',
+ 'sample-folder.tgz')
+
+ self.root_path = os.path.join(self.tmp_root_path, 'sample-folder')
+
+ # uncompress the sample folder
+ subprocess.check_output(
+ ['tar', 'xvf', sample_folder, '-C', self.tmp_root_path])
+
+ def tearDown(self):
+ if os.path.exists(self.tmp_root_path):
+ shutil.rmtree(self.tmp_root_path)
diff --git a/swh/loader/svn/tests/test_loader.py b/swh/loader/svn/tests/test_loader.py
index 92aae28..033e2ad 100644
--- a/swh/loader/svn/tests/test_loader.py
+++ b/swh/loader/svn/tests/test_loader.py
@@ -1,620 +1,587 @@
# Copyright (C) 2016 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
-import os
-import shutil
-import subprocess
-import tempfile
-import unittest
-
from nose.tools import istest
from swh.core import hashutil
from swh.loader.svn.loader import GitSvnSvnLoader, SWHSvnLoader
+from test_base import BaseTestSvnLoader
# Define loaders with no storage
# They'll just accumulate the data in place
# Only for testing purposes.
+
class TestSvnLoader:
"""Mixin class to inhibit the persistence and keep in memory the data
sent for storage.
cf. GitSvnLoaderNoStorage, SWHSvnLoaderNoStorage
"""
def __init__(self, svn_url, destination_path, origin):
super().__init__(svn_url, destination_path, origin)
# We don't want to persist any result in this test context
self.config['send_contents'] = False
self.config['send_directories'] = False
self.config['send_revisions'] = False
self.config['send_releases'] = False
self.config['send_occurrences'] = False
# Init the state
self.all_contents = []
self.all_directories = []
self.all_revisions = []
self.all_releases = []
self.all_occurrences = []
def maybe_load_contents(self, all_contents):
self.all_contents.extend(all_contents)
def maybe_load_directories(self, all_directories):
self.all_directories.extend(all_directories)
def maybe_load_revisions(self, all_revisions):
self.all_revisions.extend(all_revisions)
def maybe_load_releases(self, releases):
raise ValueError('If called, the test must break.')
def maybe_load_occurrences(self, all_occurrences):
self.all_occurrences.extend(all_occurrences)
class GitSvnLoaderNoStorage(TestSvnLoader, GitSvnSvnLoader):
"""A GitSvnLoader with no persistence.
Context:
Load an svn repository using the git-svn policy.
"""
def __init__(self, svn_url, destination_path, origin):
super().__init__(svn_url, destination_path, origin)
class SWHSvnLoaderNoStorage(TestSvnLoader, SWHSvnLoader):
"""An SWHSVNLoader with no persistence.
Context:
Load a new svn repository using the swh policy (so no update).
"""
def swh_previous_revision(self):
"""We do not know this repository so no revision.
"""
return None
class SWHSvnLoaderUpdateNoStorage(TestSvnLoader, SWHSvnLoader):
"""An SWHSVNLoader with no persistence.
Context:
Load a known svn repository using the swh policy.
We can either:
- do nothing since it does not contain any new commit (so no
change)
- either check its history is not altered and update in
consequence by loading the new revision
"""
def swh_previous_revision(self):
"""Avoid the storage persistence call and return the expected previous
revision for that repository.
Check the following for explanation about the hashes:
- test_loader.org for (swh policy).
- cf. SWHSvnLoaderITTest
"""
return {
'id': hashutil.hex_to_hash(
'4876cb10aec6f708f7466dddf547567b65f6c39c'),
'parents': [hashutil.hex_to_hash(
'a3a577948fdbda9d1061913b77a1588695eadb41')],
'directory': hashutil.hex_to_hash(
'0deab3023ac59398ae467fc4bff5583008af1ee2'),
'target_type': 'revision',
'metadata': {
'extra_headers': [
['svn_repo_uuid', '3187e211-bb14-4c82-9596-0b59d67cd7f4'],
['svn_revision', '6']
]
}
}
class SWHSvnLoaderUpdateHistoryAlteredNoStorage(TestSvnLoader, SWHSvnLoader):
"""An SWHSVNLoader with no persistence.
Context: Load a known svn repository using the swh policy with its
history altered so we do not update it.
"""
def swh_previous_revision(self):
"""Avoid the storage persistence call and return the expected previous
revision for that repository.
Check the following for explanation about the hashes:
- test_loader.org for (swh policy).
- cf. SWHSvnLoaderITTest
"""
return {
# Changed the revision id's hash to simulate history altered
'id': hashutil.hex_to_hash(
'badbadbadbadf708f7466dddf547567b65f6c39d'),
'parents': [hashutil.hex_to_hash(
'a3a577948fdbda9d1061913b77a1588695eadb41')],
'directory': hashutil.hex_to_hash(
'0deab3023ac59398ae467fc4bff5583008af1ee2'),
'target_type': 'revision',
'metadata': {
'extra_headers': [
['svn_repo_uuid', '3187e211-bb14-4c82-9596-0b59d67cd7f4'],
['svn_revision', b'6']
]
}
}
-class BaseTestLoader(unittest.TestCase):
- """Base test loader class.
-
- In its setup, it's uncompressing a local svn mirror to /tmp.
-
- """
- def setUp(self, archive_name='pkg-gourmet.tgz', filename='pkg-gourmet'):
- self.tmp_root_path = tempfile.mkdtemp()
-
- start_path = os.path.dirname(__file__)
- svn_mirror_repo = os.path.join(start_path,
- '../../../../..',
- 'swh-storage-testdata',
- 'svn-folders',
- archive_name)
-
- # uncompress the sample folder
- subprocess.check_output(
- ['tar', 'xvf', svn_mirror_repo, '-C', self.tmp_root_path],
- )
-
- self.svn_mirror_url = 'file://' + self.tmp_root_path + '/' + filename
- self.destination_path = os.path.join(
- self.tmp_root_path, 'working-copy')
-
- def tearDown(self):
- shutil.rmtree(self.tmp_root_path)
-
-
-class GitSvnLoaderITTest(BaseTestLoader):
+class GitSvnLoaderITTest(BaseTestSvnLoader):
def setUp(self):
super().setUp()
self.origin = {'id': 1, 'type': 'svn', 'url': 'file:///dev/null'}
self.loader = GitSvnLoaderNoStorage(
svn_url=self.svn_mirror_url,
destination_path=self.destination_path,
origin=self.origin)
@istest
def process_repository(self):
"""Process a repository with gitsvn policy should be ok."""
# when
self.loader.process_repository()
# then
self.assertEquals(len(self.loader.all_revisions), 6)
self.assertEquals(len(self.loader.all_releases), 0)
self.assertEquals(len(self.loader.all_occurrences), 1)
last_revision = 'bad4a83737f337d47e0ba681478214b07a707218'
# cf. test_loader.org for explaining from where those hashes
# come from
expected_revisions = {
# revision hash | directory hash # noqa
'22c0fa5195a53f2e733ec75a9b6e9d1624a8b771': '4b825dc642cb6eb9a060e54bf8d69288fbee4904', # noqa
'17a631d474f49bbebfdf3d885dcde470d7faafd7': '4b825dc642cb6eb9a060e54bf8d69288fbee4904', # noqa
'c8a9172b2a615d461154f61158180de53edc6070': '4b825dc642cb6eb9a060e54bf8d69288fbee4904', # noqa
'7c8f83394b6e8966eb46f0d3416c717612198a4b': '4b825dc642cb6eb9a060e54bf8d69288fbee4904', # noqa
'852547b3b2bb76c8582cee963e8aa180d552a15c': 'ab047e38d1532f61ff5c3621202afc3e763e9945', # noqa
last_revision: '9bcfc25001b71c333b4b5a89224217de81c56e2e', # noqa
}
for rev in self.loader.all_revisions:
rev_id = hashutil.hash_to_hex(rev['id'])
directory_id = hashutil.hash_to_hex(rev['directory'])
self.assertEquals(expected_revisions[rev_id], directory_id)
occ = self.loader.all_occurrences[0]
self.assertEquals(hashutil.hash_to_hex(occ['target']),
last_revision)
self.assertEquals(occ['origin'], self.origin['id'])
-class SWHSvnLoaderNewRepositoryITTest(BaseTestLoader):
+class SWHSvnLoaderNewRepositoryITTest(BaseTestSvnLoader):
def setUp(self):
super().setUp()
self.origin = {'id': 2, 'type': 'svn', 'url': 'file:///dev/null'}
self.loader = SWHSvnLoaderNoStorage(
svn_url=self.svn_mirror_url,
destination_path=self.destination_path,
origin=self.origin)
@istest
def process_repository(self):
"""Process a new repository with swh policy should be ok.
"""
# when
self.loader.process_repository()
# then
self.assertEquals(len(self.loader.all_revisions), 6)
self.assertEquals(len(self.loader.all_releases), 0)
self.assertEquals(len(self.loader.all_occurrences), 1)
last_revision = '4876cb10aec6f708f7466dddf547567b65f6c39c'
# cf. test_loader.org for explaining from where those hashes
# come from
expected_revisions = {
# revision hash | directory hash
'0d7dd5f751cef8fe17e8024f7d6b0e3aac2cfd71': '669a71cce6c424a81ba42b7dc5d560d32252f0ca', # noqa
'95edacc8848369d6fb1608e887d6d2474fd5224f': '008ac97a1118560797c50e3392fa1443acdaa349', # noqa
'fef26ea45a520071711ba2b9d16a2985ee837021': '3780effbe846a26751a95a8c95c511fb72be15b4', # noqa
'3f51abf3b3d466571be0855dfa67e094f9ceff1b': 'ffcca9b09c5827a6b8137322d4339c8055c3ee1e', # noqa
'a3a577948fdbda9d1061913b77a1588695eadb41': '7dc52cc04c3b8bd7c085900d60c159f7b846f866', # noqa
last_revision: '0deab3023ac59398ae467fc4bff5583008af1ee2', # noqa
}
for rev in self.loader.all_revisions:
rev_id = hashutil.hash_to_hex(rev['id'])
directory_id = hashutil.hash_to_hex(rev['directory'])
self.assertEquals(expected_revisions[rev_id], directory_id)
occ = self.loader.all_occurrences[0]
self.assertEquals(hashutil.hash_to_hex(occ['target']), last_revision)
self.assertEquals(occ['origin'], self.origin['id'])
-class SWHSvnLoaderUpdateWithNoChangeITTest(BaseTestLoader):
+class SWHSvnLoaderUpdateWithNoChangeITTest(BaseTestSvnLoader):
def setUp(self):
super().setUp()
self.origin = {'id': 2, 'type': 'svn', 'url': 'file:///dev/null'}
self.loader = SWHSvnLoaderUpdateNoStorage(
svn_url=self.svn_mirror_url,
destination_path=self.destination_path,
origin=self.origin)
@istest
def process_repository(self):
"""Process a known repository with swh policy and no new data should
be ok.
"""
# when
self.loader.process_repository()
# then
self.assertEquals(len(self.loader.all_revisions), 0)
self.assertEquals(len(self.loader.all_releases), 0)
self.assertEquals(len(self.loader.all_occurrences), 0)
-class SWHSvnLoaderUpdateWithHistoryAlteredITTest(BaseTestLoader):
+class SWHSvnLoaderUpdateWithHistoryAlteredITTest(BaseTestSvnLoader):
def setUp(self):
# the svn repository pkg-gourmet has been updated with changes
super().setUp(archive_name='pkg-gourmet-with-updates.tgz')
self.origin = {'id': 2, 'type': 'svn', 'url': 'file:///dev/null'}
self.loader = SWHSvnLoaderUpdateHistoryAlteredNoStorage(
svn_url=self.svn_mirror_url,
destination_path=self.destination_path,
origin=self.origin)
@istest
def process_repository(self):
"""Process a known repository with swh policy and history altered should
stop and do nothing.
"""
# when
self.loader.process_repository()
# then
# we got the previous run's last revision (rev 6)
# so 2 news + 1 old
self.assertEquals(len(self.loader.all_revisions), 0)
self.assertEquals(len(self.loader.all_releases), 0)
self.assertEquals(len(self.loader.all_occurrences), 0)
-class SWHSvnLoaderUpdateWithChangesITTest(BaseTestLoader):
+class SWHSvnLoaderUpdateWithChangesITTest(BaseTestSvnLoader):
def setUp(self):
# the svn repository pkg-gourmet has been updated with changes
super().setUp(archive_name='pkg-gourmet-with-updates.tgz')
self.origin = {'id': 2, 'type': 'svn', 'url': 'file:///dev/null'}
self.loader = SWHSvnLoaderUpdateNoStorage(
svn_url=self.svn_mirror_url,
destination_path=self.destination_path,
origin=self.origin)
@istest
def process_repository(self):
"""Process a known repository with swh policy and new data should
yield new revisions and occurrence.
"""
# when
self.loader.process_repository()
# then
# we got the previous run's last revision (rev 6)
# so 2 new
self.assertEquals(len(self.loader.all_revisions), 5)
self.assertEquals(len(self.loader.all_releases), 0)
self.assertEquals(len(self.loader.all_occurrences), 1)
last_revision = '171dc35522bfd17dda4e90a542a0377fb2fc707a'
# cf. test_loader.org for explaining from where those hashes
# come from
expected_revisions = {
# revision hash | directory hash
'7f5bc909c29d4e93d8ccfdda516e51ed44930ee1': '752c52134dcbf2fff13c7be1ce4e9e5dbf428a59', # noqa
'38d81702cb28db4f1a6821e64321e5825d1f7fd6': '39c813fb4717a4864bacefbd90b51a3241ae4140', # noqa
'99c27ebbd43feca179ac0e895af131d8314cafe1': '3397ca7f709639cbd36b18a0d1b70bce80018c45', # noqa
'902f29b4323a9b9de3af6d28e72dd581e76d9397': 'c4e12483f0a13e6851459295a4ae735eb4e4b5c4', # noqa
last_revision: 'fd24a76c87a3207428e06612b49860fc78e9f6dc' # noqa
}
for rev in self.loader.all_revisions:
rev_id = hashutil.hash_to_hex(rev['id'])
directory_id = hashutil.hash_to_hex(rev['directory'])
self.assertEquals(expected_revisions[rev_id], directory_id)
occ = self.loader.all_occurrences[0]
self.assertEquals(hashutil.hash_to_hex(occ['target']), last_revision)
self.assertEquals(occ['origin'], self.origin['id'])
-class SWHSvnLoaderUpdateWithUnfinishedLoadingChangesITTest(BaseTestLoader):
+class SWHSvnLoaderUpdateWithUnfinishedLoadingChangesITTest(BaseTestSvnLoader):
def setUp(self):
super().setUp(archive_name='pkg-gourmet-with-updates.tgz')
self.origin = {'id': 2, 'type': 'svn', 'url': 'file:///dev/null'}
self.loader = SWHSvnLoaderNoStorage(
svn_url=self.svn_mirror_url,
destination_path=self.destination_path,
origin=self.origin)
@istest
def process_repository(self):
"""Process a known repository with swh policy, the previous run did
not finish, so this finishes the loading
"""
previous_unfinished_revision = {
'id': hashutil.hex_to_hash(
'4876cb10aec6f708f7466dddf547567b65f6c39c'),
'parents': [hashutil.hex_to_hash(
'a3a577948fdbda9d1061913b77a1588695eadb41')],
'directory': hashutil.hex_to_hash(
'0deab3023ac59398ae467fc4bff5583008af1ee2'),
'target_type': 'revision',
'metadata': {
'extra_headers': [
['svn_repo_uuid', '3187e211-bb14-4c82-9596-0b59d67cd7f4'],
['svn_revision', '6']
]
}
}
# when
self.loader.process_repository(
known_state=previous_unfinished_revision)
# then
# we got the previous run's last revision (rev 6)
# so 2 new
self.assertEquals(len(self.loader.all_revisions), 5)
self.assertEquals(len(self.loader.all_releases), 0)
self.assertEquals(len(self.loader.all_occurrences), 1)
last_revision = '171dc35522bfd17dda4e90a542a0377fb2fc707a'
# cf. test_loader.org for explaining from where those hashes
# come from
expected_revisions = {
# revision hash | directory hash
'7f5bc909c29d4e93d8ccfdda516e51ed44930ee1': '752c52134dcbf2fff13c7be1ce4e9e5dbf428a59', # noqa
'38d81702cb28db4f1a6821e64321e5825d1f7fd6': '39c813fb4717a4864bacefbd90b51a3241ae4140', # noqa
'99c27ebbd43feca179ac0e895af131d8314cafe1': '3397ca7f709639cbd36b18a0d1b70bce80018c45', # noqa
'902f29b4323a9b9de3af6d28e72dd581e76d9397': 'c4e12483f0a13e6851459295a4ae735eb4e4b5c4', # noqa
last_revision: 'fd24a76c87a3207428e06612b49860fc78e9f6dc' # noqa
}
for rev in self.loader.all_revisions:
rev_id = hashutil.hash_to_hex(rev['id'])
directory_id = hashutil.hash_to_hex(rev['directory'])
self.assertEquals(expected_revisions[rev_id], directory_id)
occ = self.loader.all_occurrences[0]
self.assertEquals(hashutil.hash_to_hex(occ['target']), last_revision)
self.assertEquals(occ['origin'], self.origin['id'])
class SWHSvnLoaderUpdateWithUnfinishedLoadingChangesButOccurrenceDoneITTest(
- BaseTestLoader):
+ BaseTestSvnLoader):
def setUp(self):
super().setUp(archive_name='pkg-gourmet-with-updates.tgz')
self.origin = {'id': 2, 'type': 'svn', 'url': 'file:///dev/null'}
self.loader = SWHSvnLoaderUpdateNoStorage(
svn_url=self.svn_mirror_url,
destination_path=self.destination_path,
origin=self.origin)
@istest
def process_repository(self):
"""known repository, swh policy, unfinished revision is less recent
than occurrence, we start from last occurrence.
"""
previous_unfinished_revision = {
'id': hashutil.hex_to_hash(
'a3a577948fdbda9d1061913b77a1588695eadb41'),
'parents': [hashutil.hex_to_hash(
'3f51abf3b3d466571be0855dfa67e094f9ceff1b')],
'directory': hashutil.hex_to_hash(
'7dc52cc04c3b8bd7c085900d60c159f7b846f866'),
'target_type': 'revision',
'metadata': {
'extra_headers': [
['svn_repo_uuid', '3187e211-bb14-4c82-9596-0b59d67cd7f4'],
['svn_revision', '5']
]
}
}
# when
self.loader.process_repository(
known_state=previous_unfinished_revision)
# then
# we got the previous run's last revision (rev 6)
# so 2 new
self.assertEquals(len(self.loader.all_revisions), 5)
self.assertEquals(len(self.loader.all_releases), 0)
self.assertEquals(len(self.loader.all_occurrences), 1)
last_revision = '171dc35522bfd17dda4e90a542a0377fb2fc707a'
# cf. test_loader.org for explaining from where those hashes
# come from
expected_revisions = {
# revision hash | directory hash
'7f5bc909c29d4e93d8ccfdda516e51ed44930ee1': '752c52134dcbf2fff13c7be1ce4e9e5dbf428a59', # noqa
'38d81702cb28db4f1a6821e64321e5825d1f7fd6': '39c813fb4717a4864bacefbd90b51a3241ae4140', # noqa
'99c27ebbd43feca179ac0e895af131d8314cafe1': '3397ca7f709639cbd36b18a0d1b70bce80018c45', # noqa
'902f29b4323a9b9de3af6d28e72dd581e76d9397': 'c4e12483f0a13e6851459295a4ae735eb4e4b5c4', # noqa
last_revision: 'fd24a76c87a3207428e06612b49860fc78e9f6dc' # noqa
}
for rev in self.loader.all_revisions:
rev_id = hashutil.hash_to_hex(rev['id'])
directory_id = hashutil.hash_to_hex(rev['directory'])
self.assertEquals(expected_revisions[rev_id], directory_id)
occ = self.loader.all_occurrences[0]
self.assertEquals(hashutil.hash_to_hex(occ['target']), last_revision)
self.assertEquals(occ['origin'], self.origin['id'])
class SWHSvnLoaderUpdateLessRecentNoStorage(TestSvnLoader, SWHSvnLoader):
"""An SWHSVNLoader with no persistence.
Context:
Load a known svn repository using the swh policy.
The last occurrence seen is less recent than a previous
unfinished crawl.
"""
def swh_previous_revision(self):
"""Avoid the storage persistence call and return the expected previous
revision for that repository.
Check the following for explanation about the hashes:
- test_loader.org for (swh policy).
- cf. SWHSvnLoaderITTest
"""
return {
'id': hashutil.hex_to_hash(
'a3a577948fdbda9d1061913b77a1588695eadb41'),
'parents': [hashutil.hex_to_hash(
'3f51abf3b3d466571be0855dfa67e094f9ceff1b')],
'directory': hashutil.hex_to_hash(
'7dc52cc04c3b8bd7c085900d60c159f7b846f866'),
'target_type': 'revision',
'metadata': {
'extra_headers': [
['svn_repo_uuid', '3187e211-bb14-4c82-9596-0b59d67cd7f4'],
['svn_revision', '5']
]
}
}
class SWHSvnLoaderUnfinishedLoadingChangesSinceLastOccurrenceITTest(
- BaseTestLoader):
+ BaseTestSvnLoader):
def setUp(self):
super().setUp(archive_name='pkg-gourmet-with-updates.tgz')
self.origin = {'id': 2, 'type': 'svn', 'url': 'file:///dev/null'}
self.loader = SWHSvnLoaderUpdateLessRecentNoStorage(
svn_url=self.svn_mirror_url,
destination_path=self.destination_path,
origin=self.origin)
@istest
def process_repository(self):
"""known repository, swh policy, unfinished revision is less recent
than occurrence, we start from last occurrence.
"""
previous_unfinished_revision = {
'id': hashutil.hex_to_hash(
'4876cb10aec6f708f7466dddf547567b65f6c39c'),
'parents': [hashutil.hex_to_hash(
'a3a577948fdbda9d1061913b77a1588695eadb41')],
'directory': hashutil.hex_to_hash(
'0deab3023ac59398ae467fc4bff5583008af1ee2'),
'target_type': 'revision',
'metadata': {
'extra_headers': [
['svn_repo_uuid', '3187e211-bb14-4c82-9596-0b59d67cd7f4'],
['svn_revision', '6']
]
}
}
# when
self.loader.process_repository(
known_state=previous_unfinished_revision)
# then
# we got the previous run's last revision (rev 6)
# so 2 new
self.assertEquals(len(self.loader.all_revisions), 5)
self.assertEquals(len(self.loader.all_releases), 0)
self.assertEquals(len(self.loader.all_occurrences), 1)
last_revision = '171dc35522bfd17dda4e90a542a0377fb2fc707a'
# cf. test_loader.org for explaining from where those hashes
# come from
expected_revisions = {
# revision hash | directory hash
'7f5bc909c29d4e93d8ccfdda516e51ed44930ee1': '752c52134dcbf2fff13c7be1ce4e9e5dbf428a59', # noqa
'38d81702cb28db4f1a6821e64321e5825d1f7fd6': '39c813fb4717a4864bacefbd90b51a3241ae4140', # noqa
'99c27ebbd43feca179ac0e895af131d8314cafe1': '3397ca7f709639cbd36b18a0d1b70bce80018c45', # noqa
'902f29b4323a9b9de3af6d28e72dd581e76d9397': 'c4e12483f0a13e6851459295a4ae735eb4e4b5c4', # noqa
last_revision: 'fd24a76c87a3207428e06612b49860fc78e9f6dc' # noqa
}
for rev in self.loader.all_revisions:
rev_id = hashutil.hash_to_hex(rev['id'])
directory_id = hashutil.hash_to_hex(rev['directory'])
self.assertEquals(expected_revisions[rev_id], directory_id)
occ = self.loader.all_occurrences[0]
self.assertEquals(hashutil.hash_to_hex(occ['target']), last_revision)
self.assertEquals(occ['origin'], self.origin['id'])
diff --git a/swh/loader/svn/tests/test_utils.py b/swh/loader/svn/tests/test_utils.py
index a060ea2..32a918a 100644
--- a/swh/loader/svn/tests/test_utils.py
+++ b/swh/loader/svn/tests/test_utils.py
@@ -1,100 +1,189 @@
# Copyright (C) 2016 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
+import os
import unittest
from nose.tools import istest
+from test_base import BaseTestTreeLoader
from swh.loader.svn import utils
+from swh.model import git
+
class TestUtils(unittest.TestCase):
@istest
def strdate_to_timestamp(self):
"""Formatted string date should be converted in timestamp."""
actual_ts = utils.strdate_to_timestamp('2011-05-31T06:04:39.800722Z')
self.assertEquals(actual_ts, 1306821879.800722)
actual_ts = utils.strdate_to_timestamp('2011-05-31T06:03:39.123450Z')
self.assertEquals(actual_ts, 1306821819.12345)
@istest
def strdate_to_timestamp_empty_does_not_break(self):
"""Empty or None date should be timestamp 0."""
self.assertEquals(0, utils.strdate_to_timestamp(''))
self.assertEquals(0, utils.strdate_to_timestamp(None))
class TestHashesConvert(unittest.TestCase):
def setUp(self):
self.hashes = {
b'/tmp/tmp.c39vkrp1.swh.loader/pkg-fox': {
'checksums': {
'name': b'pkg-fox',
'sha1_git': b'\xad\xdf2x\x1fBX\xdb\xe8Adt\xc9\xf5~\xcb6\x98^\xbf', # noqa
'path': b'/tmp/tmp.c39vkrp1.swh.loader/pkg-fox'
},
'children': {
b'/tmp/tmp.c39vkrp1.swh.loader/pkg-fox/fox-1.2',
b'/tmp/tmp.c39vkrp1.swh.loader/pkg-fox/fox-1.4'
}
},
b'/tmp/tmp.c39vkrp1.swh.loader/pkg-fox/fox-1.4': {
'checksums': 'something',
'children': set()
},
b'/tmp/tmp.c39vkrp1.swh.loader/pkg-fox/fox-1.2': {
'checksums': 'something'
},
b'/tmp/tmp.c39vkrp1.swh.loader/pkg-fox/fox-1.3': {
'checksums': 'or something',
'children': {
b'/tmp/tmp.c39vkrp1.swh.loader/pkg-fox/some/path'
}
}
}
self.expected_output = {
b'': {
'checksums': {
'name': b'pkg-fox',
'sha1_git': b'\xad\xdf2x\x1fBX\xdb\xe8Adt\xc9\xf5~\xcb6\x98^\xbf', # noqa
'path': b'/tmp/tmp.c39vkrp1.swh.loader/pkg-fox'
},
'children': {
b'fox-1.2', b'fox-1.4'
}
},
b'fox-1.4': {
'checksums': 'something',
'children': set()
},
b'fox-1.2': {
'checksums': 'something',
},
b'fox-1.3': {
'checksums': 'or something',
'children': {
b'some/path'
}
}
}
@istest
def convert_hashes_with_relative_path(self):
actual_output = utils.convert_hashes_with_relative_path(
self.hashes,
b'/tmp/tmp.c39vkrp1.swh.loader/pkg-fox')
self.assertEquals(actual_output, self.expected_output)
@istest
def convert_hashes_with_relative_path_with_slash(self):
actual_output = utils.convert_hashes_with_relative_path(
self.hashes,
b'/tmp/tmp.c39vkrp1.swh.loader/pkg-fox/')
self.assertEquals(actual_output, self.expected_output)
+
+
+class HashtreeITTest(BaseTestTreeLoader):
+ @istest
+ def hashtree_not_existing_path(self):
+ # path does not exist
+ with self.assertRaises(ValueError):
+ utils.hashtree('/not/exists', ignore_empty_folder=False)
+
+ @istest
+ def hashtree_not_a_dir(self):
+ fpath = '/tmp/foobar'
+ with open(fpath, 'wb') as f:
+ f.write(b'foo')
+
+ # path is not a folder
+ with self.assertRaises(ValueError):
+ utils.hashtree(fpath, ignore_empty_folder=True)
+
+ os.unlink(fpath)
+
+ @istest
+ def hashtree_with_empty_folder(self):
+ # not ignoring empty folder
+ # no pattern to ignore
+ # this is the base case
+ root_hash = self.tmp_root_path.encode('utf-8')
+ actual_hash = utils.hashtree(root_hash,
+ ignore_empty_folder=False)
+
+ expected_hashes = git.compute_hashes_from_directory(
+ self.tmp_root_path.encode('utf-8'))
+
+ expected_hash = expected_hashes[root_hash]['checksums']['sha1_git']
+ self.assertEquals(actual_hash['sha1_git'], expected_hash)
+
+ @istest
+ def hashtree_ignore_pattern_with_empty_folder(self):
+ # not ignoring empty folder
+ # 'empty-folder' pattern to ignore
+ root_hash = self.tmp_root_path.encode('utf-8')
+ actual_hash = utils.hashtree(root_hash,
+ ignore_empty_folder=False,
+ ignore=['empty-folder'])
+
+ expected_hashes = git.compute_hashes_from_directory(
+ self.tmp_root_path.encode('utf-8'),
+ dir_ok_fn=lambda dp: b'empty-folder' not in dp)
+
+ expected_hash = expected_hashes[root_hash]['checksums']['sha1_git']
+ self.assertEquals(actual_hash['sha1_git'], expected_hash)
+
+ @istest
+ def hashtree_ignore_pattern_no_empty_folder(self):
+ # ignoring empty folder
+ # '/barfoo/' pattern to ignore
+ root_hash = self.tmp_root_path.encode('utf-8')
+ actual_hash = utils.hashtree(root_hash,
+ ignore_empty_folder=True,
+ ignore=['/barfoo/'])
+
+ def ignore_fn(dp):
+ return b'/barfoo/' not in dp
+
+ expected_hashes = git.compute_hashes_from_directory(
+ self.tmp_root_path.encode('utf-8'),
+ dir_ok_fn=ignore_fn,
+ remove_empty_folder=True)
+
+ expected_hash = expected_hashes[root_hash]['checksums']['sha1_git']
+ self.assertEquals(actual_hash['sha1_git'], expected_hash)
+
+ @istest
+ def hashtree_no_ignore_pattern_no_empty_folder(self):
+ # ignoring empty folder
+ root_hash = self.tmp_root_path.encode('utf-8')
+ actual_hash = utils.hashtree(root_hash,
+ ignore_empty_folder=True)
+
+ expected_hashes = git.compute_hashes_from_directory(
+ self.tmp_root_path.encode('utf-8'),
+ remove_empty_folder=True)
+
+ expected_hash = expected_hashes[root_hash]['checksums']['sha1_git']
+ self.assertEquals(actual_hash['sha1_git'], expected_hash)

File Metadata

Mime Type
text/x-diff
Expires
Fri, Jul 4, 12:36 PM (2 w, 2 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3253780

Event Timeline

About · Developer information · Legal