This is an archive of the discontinued Mercurial Phabricator instance.

Differential D485

infinitepush: update test to reflect upstream change
ClosedPublic

Authored by quark on Aug 23 2017, 12:36 AM.
Tags
None
Subscribers
durham, stash

Details

Reviewers
None
Group Reviewers
Restricted Project
Commits
rFBHGX07648c8cd7ac: infinitepush: update test to reflect upstream change
Summary

It seems debugcheckbackup could get a new kind of error with the latest
upstream code:

Traceback (most recent call last):
  File "hg/mercurial/scmutil.py", line 150, in callcatch
    return func()
  File "hg/mercurial/dispatch.py", line 292, in _runcatchfunc
    return _dispatch(req)
  File "hg/mercurial/dispatch.py", line 896, in _dispatch
    cmdpats, cmdoptions)
  File "hg/mercurial/dispatch.py", line 658, in runcommand
    ret = _runcommand(ui, options, cmd, d)
  File "hg/mercurial/dispatch.py", line 904, in _runcommand
    return cmdfunc()
  File "hg/mercurial/dispatch.py", line 893, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
  File "hg/mercurial/util.py", line 1118, in check
    return func(*args, **kwargs)
  File "hg/mercurial/extensions.py", line 322, in closure
    return func(*(args + a), **kw)
  File "hg/mercurial/util.py", line 1118, in check
    return func(*args, **kwargs)
  File "hg/hgext/mq.py", line 3542, in mqcommand
    return orig(ui, repo, *args, **kwargs)
  File "hg/mercurial/util.py", line 1118, in check
    return func(*args, **kwargs)
  File "fb-hgext/infinitepush/backupcommands.py", line 272, in checkbackup
    if not _dobackupcheck(bkpstate, ui, repo, dest, **opts):
  File "fb-hgext/infinitepush/backupcommands.py", line 469, in _dobackupcheck
    for r in lookupresults:
  File "hg/mercurial/wireproto.py", line 137, in results
    next(batchable)
  File "hg/mercurial/wireproto.py", line 238, in lookup
    self._abort(error.RepoError(data))
  File "hg/mercurial/sshpeer.py", line 235, in _abort
    raise exception
RepoError: 0e1a088ff2825213eaa838a82a842bc186f10dd5
abort: 0e1a088ff2825213eaa838a82a842bc186f10dd5!

The error message only contains a commit hash, which is not friendly to be
printed out. Therefore make sure we have control about the error message and
update the test accordingly.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Aug 23 2017, 12:36 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 23 2017, 12:36 AM
quark updated this revision to Diff 1185.Aug 23 2017, 12:43 AM
quark updated this revision to Diff 1186.Aug 23 2017, 12:50 AM
quark added a subscriber: stash.Aug 23 2017, 12:58 AM

I'm pushing the fixes trying to unblock the build.

@stash I'm not very sure about what happens exactly here. But it looks like it's a debug command so it seems not too risky to move forward.

Closed by commit rFBHGX07648c8cd7ac: infinitepush: update test to reflect upstream change (authored by quark). · Explain WhyAug 23 2017, 2:15 AM
This revision was automatically updated to reflect the committed changes.
stash added a comment.Aug 23 2017, 4:53 AM

These failures are quite weird. I'll take a look

durham added a subscriber: durham.Sep 7 2017, 12:55 AM

The failures look like they were fixed upstream in D608.

Revision Contents
Changeset List

Diff 1192

infinitepush/backupcommands.py

cleanup() cleanup()
except Exception: except Exception:
ui.warn(_('remote connection cleanup failed\n')) ui.warn(_('remote connection cleanup failed\n'))
ui.status(_('finished in %f seconds\n') % (time.time() - start)) ui.status(_('finished in %f seconds\n') % (time.time() - start))
unwrapfunction(changegroup.cg2packer, 'deltaparent', _deltaparent) unwrapfunction(changegroup.cg2packer, 'deltaparent', _deltaparent)
return 0 return 0
def _dobackupcheck(bkpstate, ui, repo, dest, **opts): def _dobackupcheck(bkpstate, ui, repo, dest, **opts):
remotehexnodes = list(bkpstate.heads) + bkpstate.localbookmarks.values() remotehexnodes = sorted(
set(bkpstate.heads).union(bkpstate.localbookmarks.values()))
if not remotehexnodes: if not remotehexnodes:
return True return True
other = _getremote(repo, ui, dest, **opts) other = _getremote(repo, ui, dest, **opts)
batch = other.iterbatch() batch = other.iterbatch()
for hexnode in remotehexnodes: for hexnode in remotehexnodes:
batch.lookup(hexnode) batch.lookup(hexnode)
batch.submit() batch.submit()
lookupresults = batch.results() lookupresults = batch.results()
i = 0
try: try:
for r in lookupresults: for i, r in enumerate(lookupresults):
# iterate over results to make it throw if revision # iterate over results to make it throw if revision
# was not found # was not found
pass pass
return True return True
except error.RepoError as e: except error.RepoError:
ui.warn(_('%s\n') % e) ui.warn(_('unknown revision %r\n') % remotehexnodes[i])
return False return False
_backuplatestinfofile = 'infinitepushlatestbackupinfo' _backuplatestinfofile = 'infinitepushlatestbackupinfo'
_backupstatefile = 'infinitepushbackupstate' _backupstatefile = 'infinitepushbackupstate'
_backupgenerationfile = 'infinitepushbackupgeneration' _backupgenerationfile = 'infinitepushbackupgeneration'
# Common helper functions # Common helper functions
def _getlocalinfo(repo): def _getlocalinfo(repo):

tests/test-infinitepush-pullbackup.t

Test debugcheckbackup Test debugcheckbackup
$ hg debugcheckbackup $ hg debugcheckbackup
abort: ambiguous repo root to restore: ['$TESTTMP', '$TESTTMP/backupsource', '$TESTTMP/backupsource2', '$TESTTMP/bookmarks/backupsource3'] abort: ambiguous repo root to restore: ['$TESTTMP', '$TESTTMP/backupsource', '$TESTTMP/backupsource2', '$TESTTMP/bookmarks/backupsource3']
(set --reporoot to disambiguate) (set --reporoot to disambiguate)
[255] [255]
$ hg debugcheckbackup --user anotheruser --reporoot $TESTTMP/backupsource $ hg debugcheckbackup --user anotheruser --reporoot $TESTTMP/backupsource
checking \$TESTTMP/backupsource on .* (re) checking \$TESTTMP/backupsource on .* (re)
$ hg debugcheckbackup --all | sort unknown revision 'e0230a60975b38a9014f098fb973199efd25c46f'
[255]
$ hg debugcheckbackup --all 2>&1 | sort
checking \$TESTTMP on .* (re) checking \$TESTTMP on .* (re)
checking \$TESTTMP/backupsource on .* (re) checking \$TESTTMP/backupsource on .* (re)
checking \$TESTTMP/backupsource2 on .* (re) checking \$TESTTMP/backupsource2 on .* (re)
checking \$TESTTMP/bookmarks/backupsource3 on .* (re) checking \$TESTTMP/bookmarks/backupsource3 on .* (re)
unknown revision '0e1a088ff2825213eaa838a82a842bc186f10dd5'
unknown revision 'a2a9ae518b62f1d9d1e884d2c16f87bb2e368c5c'
unknown revision 'a2a9ae518b62f1d9d1e884d2c16f87bb2e368c5c'
unknown revision 'c1bfda8efb6e73473d6874e35125861a34a5594d'
$ rm ../repo/.hg/scratchbranches/index/nodemap/e0230a60975b38a9014f098fb973199efd25c46f $ rm ../repo/.hg/scratchbranches/index/nodemap/e0230a60975b38a9014f098fb973199efd25c46f
$ hg debugcheckbackup --user anotheruser --reporoot $TESTTMP/backupsource $ hg debugcheckbackup --user anotheruser --reporoot $TESTTMP/backupsource
checking \$TESTTMP/backupsource on .* (re) checking \$TESTTMP/backupsource on .* (re)
unknown revision 'e0230a60975b38a9014f098fb973199efd25c46f' unknown revision 'e0230a60975b38a9014f098fb973199efd25c46f'
[255] [255]
Make another backup from backupsource2 and run `hg debugcheckbackup --all` again. Make another backup from backupsource2 and run `hg debugcheckbackup --all` again.
Make sure that both repos were checked even though check for one of them fails Make sure that both repos were checked even though check for one of them fails
$ cd ../backupsource2 $ cd ../backupsource2
$ mkcommit newcommit $ mkcommit newcommit
$ HGUSER=anotheruser hg pushbackup $ HGUSER=anotheruser hg pushbackup
starting backup .* (re) starting backup .* (re)
searching for changes searching for changes
remote: pushing 2 commits: remote: pushing 2 commits:
remote: c1bfda8efb6e secondcommit remote: c1bfda8efb6e secondcommit
remote: c03baa769a20 newcommit remote: c03baa769a20 newcommit
finished in \d+\.(\d+)? seconds (re) finished in \d+\.(\d+)? seconds (re)
$ cd ../backupsource $ cd ../backupsource
$ hg debugcheckbackup --user anotheruser --all | sort $ hg debugcheckbackup --user anotheruser --all 2>&1 | sort
unknown revision 'e0230a60975b38a9014f098fb973199efd25c46f'
checking \$TESTTMP/backupsource on .* (re) checking \$TESTTMP/backupsource on .* (re)
checking \$TESTTMP/backupsource2 on .* (re) checking \$TESTTMP/backupsource2 on .* (re)
unknown revision 'c03baa769a209c549603380d7bf496aaf42687bb'
unknown revision 'e0230a60975b38a9014f098fb973199efd25c46f'
Test getavailablebackups command Test getavailablebackups command
$ hg getavailablebackups $ hg getavailablebackups
user test has 4 available backups: user test has 4 available backups:
\$TESTTMP on .* (re) \$TESTTMP on .* (re)
\$TESTTMP/backupsource on .* (re) \$TESTTMP/backupsource on .* (re)
\$TESTTMP/backupsource2 on .* (re) \$TESTTMP/backupsource2 on .* (re)
\$TESTTMP/bookmarks/backupsource3 on .* (re) \$TESTTMP/bookmarks/backupsource3 on .* (re)
$ hg getavailablebackups --user anotheruser $ hg getavailablebackups --user anotheruser
user anotheruser has 2 available backups: user anotheruser has 2 available backups:
\$TESTTMP/backupsource on .* (re) \$TESTTMP/backupsource on .* (re)
\$TESTTMP/backupsource2 on .* (re) \$TESTTMP/backupsource2 on .* (re)
$ hg getavailablebackups --json $ hg getavailablebackups --json
{".*": \["\$TESTTMP", "\$TESTTMP/backupsource", "\$TESTTMP/backupsource2", "\$TESTTMP/bookmarks/backupsource3"\]} (re) {".*": \["\$TESTTMP", "\$TESTTMP/backupsource", "\$TESTTMP/backupsource2", "\$TESTTMP/bookmarks/backupsource3"\]} (re)