tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Revert changes to tahoe_backup/test_backup for now.

This commit is contained in:
Itamar Turner-Trauring 2021-03-18 10:31:58 -04:00
parent 56efe7ae48
commit 34f1f43e95
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/scripts/cli.py
View File

@ -351,7 +351,7 @@ class BackupOptions(FileStoreOptions):
line. The file is assumed to be in the argv encoding.""" line. The file is assumed to be in the argv encoding."""
abs_filepath = argv_to_abspath(filepath) abs_filepath = argv_to_abspath(filepath)
try: try:
exclude_file = open(abs_filepath) exclude_file = file(abs_filepath)
except: except:
raise BackupConfigurationError('Error opening exclude file %s.' % quote_local_unicode_path(abs_filepath)) raise BackupConfigurationError('Error opening exclude file %s.' % quote_local_unicode_path(abs_filepath))
try: try:

10
src/allmydata/scripts/tahoe_backup.py
View File

@ -2,7 +2,7 @@ from __future__ import print_function
import os.path import os.path
import time import time
from urllib.parse import quote as url_quote import urllib
import json import json
import datetime import datetime
from allmydata.scripts.common import get_alias, escape_path, DEFAULT_ALIAS, \ from allmydata.scripts.common import get_alias, escape_path, DEFAULT_ALIAS, \
@ -52,7 +52,7 @@ def mkdir(contents, options):
def put_child(dirurl, childname, childcap): def put_child(dirurl, childname, childcap):
assert dirurl[-1] != "/" assert dirurl[-1] != "/"
url = dirurl + "/" + url_quote(unicode_to_url(childname)) + "?t=uri" url = dirurl + "/" + urllib.quote(unicode_to_url(childname)) + "?t=uri"
resp = do_http("PUT", url, childcap) resp = do_http("PUT", url, childcap)
if resp.status not in (200, 201): if resp.status not in (200, 201):
raise HTTPError("Error during put_child", resp) raise HTTPError("Error during put_child", resp)
@ -97,7 +97,7 @@ class BackerUpper(object):
except UnknownAliasError as e: except UnknownAliasError as e:
e.display(stderr) e.display(stderr)
return 1 return 1
to_url = nodeurl + "uri/%s/" % url_quote(rootcap) to_url = nodeurl + "uri/%s/" % urllib.quote(rootcap)
if path: if path:
to_url += escape_path(path) to_url += escape_path(path)
if not to_url.endswith("/"): if not to_url.endswith("/"):
@ -192,7 +192,7 @@ class BackerUpper(object):
filecap = r.was_uploaded() filecap = r.was_uploaded()
self.verboseprint("checking %s" % quote_output(filecap)) self.verboseprint("checking %s" % quote_output(filecap))
nodeurl = self.options['node-url'] nodeurl = self.options['node-url']
checkurl = nodeurl + "uri/%s?t=check&output=JSON" % url_quote(filecap) checkurl = nodeurl + "uri/%s?t=check&output=JSON" % urllib.quote(filecap)
self._files_checked += 1 self._files_checked += 1
resp = do_http("POST", checkurl) resp = do_http("POST", checkurl)
if resp.status != 200: if resp.status != 200:
@ -225,7 +225,7 @@ class BackerUpper(object):
dircap = r.was_created() dircap = r.was_created()
self.verboseprint("checking %s" % quote_output(dircap)) self.verboseprint("checking %s" % quote_output(dircap))
nodeurl = self.options['node-url'] nodeurl = self.options['node-url']
checkurl = nodeurl + "uri/%s?t=check&output=JSON" % url_quote(dircap) checkurl = nodeurl + "uri/%s?t=check&output=JSON" % urllib.quote(dircap)
self._directories_checked += 1 self._directories_checked += 1
resp = do_http("POST", checkurl) resp = do_http("POST", checkurl)
if resp.status != 200: if resp.status != 200:

4
src/allmydata/test/cli/test_backup.py
View File

@ -2,11 +2,11 @@ import os.path
from six.moves import cStringIO as StringIO from six.moves import cStringIO as StringIO
from datetime import timedelta from datetime import timedelta
import re import re
import builtins
from twisted.trial import unittest from twisted.trial import unittest
from twisted.python.monkey import MonkeyPatcher from twisted.python.monkey import MonkeyPatcher
import __builtin__
from allmydata.util import fileutil from allmydata.util import fileutil
from allmydata.util.fileutil import abspath_expanduser_unicode from allmydata.util.fileutil import abspath_expanduser_unicode
from allmydata.util.encodingutil import get_io_encoding, unicode_to_argv from allmydata.util.encodingutil import get_io_encoding, unicode_to_argv
@ -412,7 +412,7 @@ class Backup(GridTestMixin, CLITestMixin, StallMixin, unittest.TestCase):
self.failUnlessEqual(name, abspath_expanduser_unicode(exclude_file)) self.failUnlessEqual(name, abspath_expanduser_unicode(exclude_file))
return StringIO() return StringIO()
patcher = MonkeyPatcher((builtins, 'open', call_file)) patcher = MonkeyPatcher((__builtin__, 'file', call_file))
patcher.runWithPatches(parse_options, basedir, "backup", ['--exclude-from', unicode_to_argv(exclude_file), 'from', 'to']) patcher.runWithPatches(parse_options, basedir, "backup", ['--exclude-from', unicode_to_argv(exclude_file), 'from', 'to'])
self.failUnless(ns.called) self.failUnless(ns.called)