← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_config.py

(jelmer) Switch the commit code over to use config stacks. (Bazaar
 Developers)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_config.py
494
494
 
495
495
    def test_signatures_default(self):
496
496
        my_config = config.Config()
497
 
        self.assertFalse(my_config.signature_needed())
 
497
        self.assertFalse(
 
498
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
499
                my_config.signature_needed))
498
500
        self.assertEqual(config.CHECK_IF_POSSIBLE,
499
 
                         my_config.signature_checking())
 
501
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
502
                my_config.signature_checking))
500
503
        self.assertEqual(config.SIGN_WHEN_REQUIRED,
501
 
                         my_config.signing_policy())
 
504
                self.applyDeprecated(deprecated_in((2, 5, 0)),
 
505
                    my_config.signing_policy))
502
506
 
503
507
    def test_signatures_template_method(self):
504
508
        my_config = InstrumentedConfig()
505
 
        self.assertEqual(config.CHECK_NEVER, my_config.signature_checking())
 
509
        self.assertEqual(config.CHECK_NEVER,
 
510
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
511
                my_config.signature_checking))
506
512
        self.assertEqual(['_get_signature_checking'], my_config._calls)
507
513
 
508
514
    def test_signatures_template_method_none(self):
509
515
        my_config = InstrumentedConfig()
510
516
        my_config._signatures = None
511
517
        self.assertEqual(config.CHECK_IF_POSSIBLE,
512
 
                         my_config.signature_checking())
 
518
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
519
                             my_config.signature_checking))
513
520
        self.assertEqual(['_get_signature_checking'], my_config._calls)
514
521
 
515
522
    def test_gpg_signing_command_default(self):
516
523
        my_config = config.Config()
517
 
        self.assertEqual('gpg', my_config.gpg_signing_command())
 
524
        self.assertEqual('gpg',
 
525
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
526
                my_config.gpg_signing_command))
518
527
 
519
528
    def test_get_user_option_default(self):
520
529
        my_config = config.Config()
522
531
 
523
532
    def test_post_commit_default(self):
524
533
        my_config = config.Config()
525
 
        self.assertEqual(None, my_config.post_commit())
 
534
        self.assertEqual(None, self.applyDeprecated(deprecated_in((2, 5, 0)),
 
535
                                                    my_config.post_commit))
 
536
 
526
537
 
527
538
    def test_log_format_default(self):
528
539
        my_config = config.Config()
530
541
 
531
542
    def test_acceptable_keys_default(self):
532
543
        my_config = config.Config()
533
 
        self.assertEqual(None, my_config.acceptable_keys())
 
544
        self.assertEqual(None, self.applyDeprecated(deprecated_in((2, 5, 0)),
 
545
            my_config.acceptable_keys))
534
546
 
535
547
    def test_validate_signatures_in_log_default(self):
536
548
        my_config = config.Config()
1229
1241
    def test_signatures_always(self):
1230
1242
        my_config = config.GlobalConfig.from_string(sample_always_signatures)
1231
1243
        self.assertEqual(config.CHECK_NEVER,
1232
 
                         my_config.signature_checking())
 
1244
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1245
                             my_config.signature_checking))
1233
1246
        self.assertEqual(config.SIGN_ALWAYS,
1234
 
                         my_config.signing_policy())
1235
 
        self.assertEqual(True, my_config.signature_needed())
 
1247
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1248
                             my_config.signing_policy))
 
1249
        self.assertEqual(True,
 
1250
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1251
                my_config.signature_needed))
1236
1252
 
1237
1253
    def test_signatures_if_possible(self):
1238
1254
        my_config = config.GlobalConfig.from_string(sample_maybe_signatures)
1239
1255
        self.assertEqual(config.CHECK_NEVER,
1240
 
                         my_config.signature_checking())
 
1256
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1257
                             my_config.signature_checking))
1241
1258
        self.assertEqual(config.SIGN_WHEN_REQUIRED,
1242
 
                         my_config.signing_policy())
1243
 
        self.assertEqual(False, my_config.signature_needed())
 
1259
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1260
                             my_config.signing_policy))
 
1261
        self.assertEqual(False, self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1262
            my_config.signature_needed))
1244
1263
 
1245
1264
    def test_signatures_ignore(self):
1246
1265
        my_config = config.GlobalConfig.from_string(sample_ignore_signatures)
1247
1266
        self.assertEqual(config.CHECK_ALWAYS,
1248
 
                         my_config.signature_checking())
 
1267
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1268
                             my_config.signature_checking))
1249
1269
        self.assertEqual(config.SIGN_NEVER,
1250
 
                         my_config.signing_policy())
1251
 
        self.assertEqual(False, my_config.signature_needed())
 
1270
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1271
                             my_config.signing_policy))
 
1272
        self.assertEqual(False, self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1273
            my_config.signature_needed))
1252
1274
 
1253
1275
    def _get_sample_config(self):
1254
1276
        my_config = config.GlobalConfig.from_string(sample_config_text)
1256
1278
 
1257
1279
    def test_gpg_signing_command(self):
1258
1280
        my_config = self._get_sample_config()
1259
 
        self.assertEqual("gnome-gpg", my_config.gpg_signing_command())
1260
 
        self.assertEqual(False, my_config.signature_needed())
 
1281
        self.assertEqual("gnome-gpg",
 
1282
            self.applyDeprecated(
 
1283
                deprecated_in((2, 5, 0)), my_config.gpg_signing_command))
 
1284
        self.assertEqual(False, self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1285
            my_config.signature_needed))
1261
1286
 
1262
1287
    def test_gpg_signing_key(self):
1263
1288
        my_config = self._get_sample_config()
1264
 
        self.assertEqual("DD4D5088", my_config.gpg_signing_key())
 
1289
        self.assertEqual("DD4D5088",
 
1290
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1291
                my_config.gpg_signing_key))
1265
1292
 
1266
1293
    def _get_empty_config(self):
1267
1294
        my_config = config.GlobalConfig()
1269
1296
 
1270
1297
    def test_gpg_signing_command_unset(self):
1271
1298
        my_config = self._get_empty_config()
1272
 
        self.assertEqual("gpg", my_config.gpg_signing_command())
 
1299
        self.assertEqual("gpg",
 
1300
            self.applyDeprecated(
 
1301
                deprecated_in((2, 5, 0)), my_config.gpg_signing_command))
1273
1302
 
1274
1303
    def test_get_user_option_default(self):
1275
1304
        my_config = self._get_empty_config()
1282
1311
 
1283
1312
    def test_post_commit_default(self):
1284
1313
        my_config = self._get_sample_config()
1285
 
        self.assertEqual(None, my_config.post_commit())
 
1314
        self.assertEqual(None,
 
1315
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1316
                                              my_config.post_commit))
1286
1317
 
1287
1318
    def test_configured_logformat(self):
1288
1319
        my_config = self._get_sample_config()
1290
1321
 
1291
1322
    def test_configured_acceptable_keys(self):
1292
1323
        my_config = self._get_sample_config()
1293
 
        self.assertEqual("amy", my_config.acceptable_keys())
 
1324
        self.assertEqual("amy",
 
1325
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1326
                my_config.acceptable_keys))
1294
1327
 
1295
1328
    def test_configured_validate_signatures_in_log(self):
1296
1329
        my_config = self._get_sample_config()
1532
1565
        self.get_branch_config('http://www.example.com',
1533
1566
                                 global_config=sample_ignore_signatures)
1534
1567
        self.assertEqual(config.CHECK_ALWAYS,
1535
 
                         self.my_config.signature_checking())
 
1568
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1569
                             self.my_config.signature_checking))
1536
1570
        self.assertEqual(config.SIGN_NEVER,
1537
 
                         self.my_config.signing_policy())
 
1571
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1572
                             self.my_config.signing_policy))
1538
1573
 
1539
1574
    def test_signatures_never(self):
1540
1575
        self.get_branch_config('/a/c')
1541
1576
        self.assertEqual(config.CHECK_NEVER,
1542
 
                         self.my_config.signature_checking())
 
1577
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1578
                             self.my_config.signature_checking))
1543
1579
 
1544
1580
    def test_signatures_when_available(self):
1545
1581
        self.get_branch_config('/a/', global_config=sample_ignore_signatures)
1546
1582
        self.assertEqual(config.CHECK_IF_POSSIBLE,
1547
 
                         self.my_config.signature_checking())
 
1583
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1584
                             self.my_config.signature_checking))
1548
1585
 
1549
1586
    def test_signatures_always(self):
1550
1587
        self.get_branch_config('/b')
1551
1588
        self.assertEqual(config.CHECK_ALWAYS,
1552
 
                         self.my_config.signature_checking())
 
1589
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1590
                         self.my_config.signature_checking))
1553
1591
 
1554
1592
    def test_gpg_signing_command(self):
1555
1593
        self.get_branch_config('/b')
1556
 
        self.assertEqual("gnome-gpg", self.my_config.gpg_signing_command())
 
1594
        self.assertEqual("gnome-gpg",
 
1595
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1596
                self.my_config.gpg_signing_command))
1557
1597
 
1558
1598
    def test_gpg_signing_command_missing(self):
1559
1599
        self.get_branch_config('/a')
1560
 
        self.assertEqual("false", self.my_config.gpg_signing_command())
 
1600
        self.assertEqual("false",
 
1601
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1602
                self.my_config.gpg_signing_command))
1561
1603
 
1562
1604
    def test_gpg_signing_key(self):
1563
1605
        self.get_branch_config('/b')
1564
 
        self.assertEqual("DD4D5088", self.my_config.gpg_signing_key())
 
1606
        self.assertEqual("DD4D5088", self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1607
            self.my_config.gpg_signing_key))
1565
1608
 
1566
1609
    def test_gpg_signing_key_default(self):
1567
1610
        self.get_branch_config('/a')
1568
 
        self.assertEqual("erik@bagfors.nu", self.my_config.gpg_signing_key())
 
1611
        self.assertEqual("erik@bagfors.nu",
 
1612
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1613
                self.my_config.gpg_signing_key))
1569
1614
 
1570
1615
    def test_get_user_option_global(self):
1571
1616
        self.get_branch_config('/a')
1659
1704
    def test_post_commit_default(self):
1660
1705
        self.get_branch_config('/a/c')
1661
1706
        self.assertEqual('bzrlib.tests.test_config.post_commit',
1662
 
                         self.my_config.post_commit())
 
1707
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1708
                                              self.my_config.post_commit))
1663
1709
 
1664
1710
    def get_branch_config(self, location, global_config=None,
1665
1711
                          location_config=None):
1774
1820
    def test_signatures_forced(self):
1775
1821
        my_config = self.get_branch_config(
1776
1822
            global_config=sample_always_signatures)
1777
 
        self.assertEqual(config.CHECK_NEVER, my_config.signature_checking())
1778
 
        self.assertEqual(config.SIGN_ALWAYS, my_config.signing_policy())
1779
 
        self.assertTrue(my_config.signature_needed())
 
1823
        self.assertEqual(config.CHECK_NEVER,
 
1824
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1825
                my_config.signature_checking))
 
1826
        self.assertEqual(config.SIGN_ALWAYS,
 
1827
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1828
                my_config.signing_policy))
 
1829
        self.assertTrue(self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1830
            my_config.signature_needed))
1780
1831
 
1781
1832
    def test_signatures_forced_branch(self):
1782
1833
        my_config = self.get_branch_config(
1783
1834
            global_config=sample_ignore_signatures,
1784
1835
            branch_data_config=sample_always_signatures)
1785
 
        self.assertEqual(config.CHECK_NEVER, my_config.signature_checking())
1786
 
        self.assertEqual(config.SIGN_ALWAYS, my_config.signing_policy())
1787
 
        self.assertTrue(my_config.signature_needed())
 
1836
        self.assertEqual(config.CHECK_NEVER,
 
1837
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1838
                my_config.signature_checking))
 
1839
        self.assertEqual(config.SIGN_ALWAYS,
 
1840
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1841
                my_config.signing_policy))
 
1842
        self.assertTrue(self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1843
            my_config.signature_needed))
1788
1844
 
1789
1845
    def test_gpg_signing_command(self):
1790
1846
        my_config = self.get_branch_config(
1791
1847
            global_config=sample_config_text,
1792
1848
            # branch data cannot set gpg_signing_command
1793
1849
            branch_data_config="gpg_signing_command=pgp")
1794
 
        self.assertEqual('gnome-gpg', my_config.gpg_signing_command())
 
1850
        self.assertEqual('gnome-gpg',
 
1851
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1852
                my_config.gpg_signing_command))
1795
1853
 
1796
1854
    def test_get_user_option_global(self):
1797
1855
        my_config = self.get_branch_config(global_config=sample_config_text)
1804
1862
                                      location_config=sample_branches_text)
1805
1863
        self.assertEqual(my_config.branch.base, '/a/c')
1806
1864
        self.assertEqual('bzrlib.tests.test_config.post_commit',
1807
 
                         my_config.post_commit())
 
1865
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1866
                                              my_config.post_commit))
1808
1867
        my_config.set_user_option('post_commit', 'rmtree_root')
1809
1868
        # post-commit is ignored when present in branch data
1810
1869
        self.assertEqual('bzrlib.tests.test_config.post_commit',
1811
 
                         my_config.post_commit())
 
1870
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1871
                                              my_config.post_commit))
1812
1872
        my_config.set_user_option('post_commit', 'rmtree_root',
1813
1873
                                  store=config.STORE_LOCATION)
1814
 
        self.assertEqual('rmtree_root', my_config.post_commit())
 
1874
        self.assertEqual('rmtree_root',
 
1875
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1876
                                              my_config.post_commit))
1815
1877
 
1816
1878
    def test_config_precedence(self):
1817
1879
        # FIXME: eager test, luckily no persitent config file makes it fail