/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_selftest.py

  • Committer: Jelmer Vernooij
  • Date: 2018-08-14 01:15:02 UTC
  • mto: This revision was merged to the branch mainline in revision 7078.
  • Revision ID: jelmer@jelmer.uk-20180814011502-5zaydaq02vc2qxo1
Fix tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_selftest.py
1804
1804
 
1805
1805
    def test_skip_has_no_log(self):
1806
1806
        result = self._run_test('test_skip')
1807
 
        reasons = _get_skip_reasons(result)
 
1807
        reasons = result.skip_reasons
1808
1808
        self.assertEqual({'reason'}, set(reasons))
1809
1809
        skips = reasons['reason']
1810
1810
        self.assertEqual(1, len(skips))
1815
1815
        # testtools doesn't know about addNotSupported, so it just gets
1816
1816
        # considered as a skip
1817
1817
        result = self._run_test('test_missing_feature')
1818
 
        reasons = _get_skip_reasons(result)
 
1818
        reasons = result.skip_reasons
1819
1819
        self.assertEqual({str(missing_feature)}, set(reasons))
1820
1820
        skips = reasons[str(missing_feature)]
1821
1821
        self.assertEqual(1, len(skips))
2226
2226
        content, result = self.run_subunit_stream('test_skip')
2227
2227
        self.assertNotContainsRe(content, '(?m)^log$')
2228
2228
        self.assertNotContainsRe(content, 'this test will be skipped')
2229
 
        reasons = _get_skip_reasons(result)
 
2229
        reasons = result.skip_reasons
2230
2230
        self.assertEqual({'reason'}, set(reasons))
2231
2231
        skips = reasons['reason']
2232
2232
        self.assertEqual(1, len(skips))
2238
2238
        content, result = self.run_subunit_stream('test_missing_feature')
2239
2239
        self.assertNotContainsRe(content, '(?m)^log$')
2240
2240
        self.assertNotContainsRe(content, 'missing the feature')
2241
 
        reasons = _get_skip_reasons(result)
 
2241
        reasons = result.skip_reasons
2242
2242
        self.assertEqual({'_MissingFeature\n'}, set(reasons))
2243
2243
        skips = reasons['_MissingFeature\n']
2244
2244
        self.assertEqual(1, len(skips))
2306
2306
        self.assertEqual(err, self.err)
2307
2307
 
2308
2308
    def test_run_bzr_error_regexes(self):
2309
 
        self.out = b''
2310
 
        self.err = b"bzr: ERROR: foobarbaz is not versioned"
 
2309
        self.out = ''
 
2310
        self.err = "bzr: ERROR: foobarbaz is not versioned"
2311
2311
        self.result = 3
2312
2312
        out, err = self.run_bzr_error(
2313
 
            [b"bzr: ERROR: foobarbaz is not versioned"],
 
2313
            ["bzr: ERROR: foobarbaz is not versioned"],
2314
2314
            ['file-id', 'foobarbaz'])
2315
2315
 
2316
2316
    def test_encoding(self):