Differential D6721 Diff 24425 swh/loader/svn/loader.py

Changeset View

Standalone View

View Options

swh/loader/svn/loader.py

Show First 20 Lines • Show All 385 Lines • ▼ Show 20 Lines ]:

and count % self.check_revision == 0 and count % self.check_revision == 0

): ):

self._check_revision_divergence(rev, dir_id) self._check_revision_divergence(rev, dir_id)

if nextrev: if nextrev:

revision_parents[nextrev] = [swh_revision.id] revision_parents[nextrev] = [swh_revision.id]

yield _contents, _skipped_contents, _directories, swh_revision yield _contents, _skipped_contents, _directories, swh_revision

if not self.debug and self.svnrepo:

# clean directory where revisions were replayed to gain some disk space

# before the post_load operation

ardumontUnsubmitted

Not Done

wasn't it already done?

ardumont: wasn't it already done?

ardumontUnsubmitted

Not Done

yield _contents, _skipped_contents, _directories, swh_revision

- if not self.debug and self.svnrepo:

- # clean directory where revisions were replayed to gain some disk space

- # before the post_load operation

- self.svnrepo.clean_fs(self.svnrepo.local_url)

+ self.cleanup()

def prepare_origin_visit(self):

I think that's what done in the method cleanup already...
But as it's called after post_load, we do have too much stuff at the post_load step.
So this ^ should be enough, shouldn't it?

ardumont: I think that's what done in the method `cleanup` already... But as it's called after…

anlambertAuthorUnsubmitted

Done

I tried to use cleanup in the first place but got that error when running tests:

Traceback (most recent call last):
  File "/home/anlambert/swh/swh-environment/swh-loader-core/swh/loader/core/loader.py", line 353, in load
    self.post_load()
  File "/home/anlambert/swh/swh-environment/swh-loader-svn/swh/loader/svn/tests/test_loader.py", line 1822, in post_load
    return super().post_load(success)
  File "/home/anlambert/swh/swh-environment/swh-loader-svn/swh/loader/svn/loader.py", line 555, in post_load
    self._check_revision_divergence(
  File "/home/anlambert/swh/swh-environment/swh-loader-svn/swh/loader/svn/loader.py", line 330, in _check_revision_divergence
    checked_dir_id = self.swh_revision_hash_tree_at_svn_revision(rev)
  File "/home/anlambert/swh/swh-environment/swh-loader-svn/swh/loader/svn/loader.py", line 162, in swh_revision_hash_tree_at_svn_revision
    local_dirname, local_url = self.svnrepo.export_temporary(revision)
  File "/home/anlambert/swh/swh-environment/swh-loader-svn/swh/loader/svn/svn.py", line 204, in export_temporary
    local_dirname = tempfile.mkdtemp(
  File "/usr/lib/python3.9/tempfile.py", line 498, in mkdtemp
    _os.mkdir(file, 0o700)
FileNotFoundError: [Errno 2] No such file or directory: '/tmp/pytest-of-anlambert/pytest-296/test_loader_svn_empty_local_di0/swh.loader.svn.ky9d3ggx-109839/check-revision-6.3xd63zy4'

anlambert: I tried to use `cleanup` in the first place but got that error when running tests: ```…

self.svnrepo.clean_fs(self.svnrepo.local_url)

def prepare_origin_visit(self): def prepare_origin_visit(self):

self.origin = Origin(url=self.origin_url if self.origin_url else self.svn_url) self.origin = Origin(url=self.origin_url if self.origin_url else self.svn_url)

def prepare(self): def prepare(self):

latest_snapshot_revision = self._latest_snapshot_revision(self.origin_url) latest_snapshot_revision = self._latest_snapshot_revision(self.origin_url)

if latest_snapshot_revision: if latest_snapshot_revision:

self.latest_snapshot, self.latest_revision = latest_snapshot_revision self.latest_snapshot, self.latest_revision = latest_snapshot_revision

▲ Show 20 Lines • Show All 428 Lines • Show Last 20 Lines