mirror of
https://github.com/borgbackup/borg.git
synced 2024-12-23 08:16:54 +00:00
Merge branch 'master' into move-to-src
This commit is contained in:
commit
7e0ea1635a
1 changed files with 6 additions and 6 deletions
|
@ -512,20 +512,20 @@ def test_stderr_messages(self):
|
|||
# stderr messages don't get an implicit newline
|
||||
self.assert_equal(self.stderr.getvalue(), 'Remote: unstructured stderr message')
|
||||
|
||||
def test_old_format_messages(self):
|
||||
def test_pre11_format_messages(self):
|
||||
self.handler.setLevel(logging.DEBUG)
|
||||
logging.getLogger().setLevel(logging.DEBUG)
|
||||
|
||||
handle_remote_line("$LOG INFO Remote: old format message")
|
||||
self.assert_equal(self.stream.getvalue(), 'Remote: old format message\n')
|
||||
handle_remote_line("$LOG INFO Remote: borg < 1.1 format message")
|
||||
self.assert_equal(self.stream.getvalue(), 'Remote: borg < 1.1 format message\n')
|
||||
self.assert_equal(self.stderr.getvalue(), '')
|
||||
|
||||
def test_new_format_messages(self):
|
||||
def test_post11_format_messages(self):
|
||||
self.handler.setLevel(logging.DEBUG)
|
||||
logging.getLogger().setLevel(logging.DEBUG)
|
||||
|
||||
handle_remote_line("$LOG INFO borg.repository Remote: new format message")
|
||||
self.assert_equal(self.stream.getvalue(), 'Remote: new format message\n')
|
||||
handle_remote_line("$LOG INFO borg.repository Remote: borg >= 1.1 format message")
|
||||
self.assert_equal(self.stream.getvalue(), 'Remote: borg >= 1.1 format message\n')
|
||||
self.assert_equal(self.stderr.getvalue(), '')
|
||||
|
||||
def test_remote_messages_screened(self):
|
||||
|
|
Loading…
Reference in a new issue