← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_config.py

Convert some gpg options to config stacks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_config.py
500
500
 
501
501
    def test_signatures_default(self):
502
502
        my_config = config.Config()
503
 
        self.assertFalse(my_config.signature_needed())
 
503
        self.assertFalse(
 
504
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
505
                my_config.signature_needed))
504
506
        self.assertEqual(config.CHECK_IF_POSSIBLE,
505
 
                         my_config.signature_checking())
 
507
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
508
                my_config.signature_checking))
506
509
        self.assertEqual(config.SIGN_WHEN_REQUIRED,
507
 
                         my_config.signing_policy())
 
510
                self.applyDeprecated(deprecated_in((2, 5, 0)),
 
511
                    my_config.signing_policy))
508
512
 
509
513
    def test_signatures_template_method(self):
510
514
        my_config = InstrumentedConfig()
511
 
        self.assertEqual(config.CHECK_NEVER, my_config.signature_checking())
 
515
        self.assertEqual(config.CHECK_NEVER,
 
516
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
517
                my_config.signature_checking))
512
518
        self.assertEqual(['_get_signature_checking'], my_config._calls)
513
519
 
514
520
    def test_signatures_template_method_none(self):
515
521
        my_config = InstrumentedConfig()
516
522
        my_config._signatures = None
517
523
        self.assertEqual(config.CHECK_IF_POSSIBLE,
518
 
                         my_config.signature_checking())
 
524
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
525
                             my_config.signature_checking))
519
526
        self.assertEqual(['_get_signature_checking'], my_config._calls)
520
527
 
521
528
    def test_gpg_signing_command_default(self):
522
529
        my_config = config.Config()
523
 
        self.assertEqual('gpg', my_config.gpg_signing_command())
 
530
        self.assertEqual('gpg',
 
531
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
532
                my_config.gpg_signing_command))
524
533
 
525
534
    def test_get_user_option_default(self):
526
535
        my_config = config.Config()
536
545
 
537
546
    def test_acceptable_keys_default(self):
538
547
        my_config = config.Config()
539
 
        self.assertEqual(None, my_config.acceptable_keys())
 
548
        self.assertEqual(None, self.applyDeprecated(deprecated_in((2, 5, 0)),
 
549
            my_config.acceptable_keys))
540
550
 
541
551
    def test_validate_signatures_in_log_default(self):
542
552
        my_config = config.Config()
1235
1245
    def test_signatures_always(self):
1236
1246
        my_config = config.GlobalConfig.from_string(sample_always_signatures)
1237
1247
        self.assertEqual(config.CHECK_NEVER,
1238
 
                         my_config.signature_checking())
 
1248
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1249
                             my_config.signature_checking))
1239
1250
        self.assertEqual(config.SIGN_ALWAYS,
1240
 
                         my_config.signing_policy())
1241
 
        self.assertEqual(True, my_config.signature_needed())
 
1251
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1252
                             my_config.signing_policy))
 
1253
        self.assertEqual(True,
 
1254
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1255
                my_config.signature_needed))
1242
1256
 
1243
1257
    def test_signatures_if_possible(self):
1244
1258
        my_config = config.GlobalConfig.from_string(sample_maybe_signatures)
1245
1259
        self.assertEqual(config.CHECK_NEVER,
1246
 
                         my_config.signature_checking())
 
1260
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1261
                             my_config.signature_checking))
1247
1262
        self.assertEqual(config.SIGN_WHEN_REQUIRED,
1248
 
                         my_config.signing_policy())
1249
 
        self.assertEqual(False, my_config.signature_needed())
 
1263
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1264
                             my_config.signing_policy))
 
1265
        self.assertEqual(False, self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1266
            my_config.signature_needed))
1250
1267
 
1251
1268
    def test_signatures_ignore(self):
1252
1269
        my_config = config.GlobalConfig.from_string(sample_ignore_signatures)
1253
1270
        self.assertEqual(config.CHECK_ALWAYS,
1254
 
                         my_config.signature_checking())
 
1271
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1272
                             my_config.signature_checking))
1255
1273
        self.assertEqual(config.SIGN_NEVER,
1256
 
                         my_config.signing_policy())
1257
 
        self.assertEqual(False, my_config.signature_needed())
 
1274
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1275
                             my_config.signing_policy))
 
1276
        self.assertEqual(False, self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1277
            my_config.signature_needed))
1258
1278
 
1259
1279
    def _get_sample_config(self):
1260
1280
        my_config = config.GlobalConfig.from_string(sample_config_text)
1262
1282
 
1263
1283
    def test_gpg_signing_command(self):
1264
1284
        my_config = self._get_sample_config()
1265
 
        self.assertEqual("gnome-gpg", my_config.gpg_signing_command())
1266
 
        self.assertEqual(False, my_config.signature_needed())
 
1285
        self.assertEqual("gnome-gpg",
 
1286
            self.applyDeprecated(
 
1287
                deprecated_in((2, 5, 0)), my_config.gpg_signing_command))
 
1288
        self.assertEqual(False, self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1289
            my_config.signature_needed))
1267
1290
 
1268
1291
    def test_gpg_signing_key(self):
1269
1292
        my_config = self._get_sample_config()
1270
 
        self.assertEqual("DD4D5088", my_config.gpg_signing_key())
 
1293
        self.assertEqual("DD4D5088",
 
1294
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1295
                my_config.gpg_signing_key))
1271
1296
 
1272
1297
    def _get_empty_config(self):
1273
1298
        my_config = config.GlobalConfig()
1275
1300
 
1276
1301
    def test_gpg_signing_command_unset(self):
1277
1302
        my_config = self._get_empty_config()
1278
 
        self.assertEqual("gpg", my_config.gpg_signing_command())
 
1303
        self.assertEqual("gpg",
 
1304
            self.applyDeprecated(
 
1305
                deprecated_in((2, 5, 0)), my_config.gpg_signing_command))
1279
1306
 
1280
1307
    def test_get_user_option_default(self):
1281
1308
        my_config = self._get_empty_config()
1296
1323
 
1297
1324
    def test_configured_acceptable_keys(self):
1298
1325
        my_config = self._get_sample_config()
1299
 
        self.assertEqual("amy", my_config.acceptable_keys())
 
1326
        self.assertEqual("amy",
 
1327
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1328
                my_config.acceptable_keys))
1300
1329
 
1301
1330
    def test_configured_validate_signatures_in_log(self):
1302
1331
        my_config = self._get_sample_config()
1538
1567
        self.get_branch_config('http://www.example.com',
1539
1568
                                 global_config=sample_ignore_signatures)
1540
1569
        self.assertEqual(config.CHECK_ALWAYS,
1541
 
                         self.my_config.signature_checking())
 
1570
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1571
                             self.my_config.signature_checking))
1542
1572
        self.assertEqual(config.SIGN_NEVER,
1543
 
                         self.my_config.signing_policy())
 
1573
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1574
                             self.my_config.signing_policy))
1544
1575
 
1545
1576
    def test_signatures_never(self):
1546
1577
        self.get_branch_config('/a/c')
1547
1578
        self.assertEqual(config.CHECK_NEVER,
1548
 
                         self.my_config.signature_checking())
 
1579
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1580
                             self.my_config.signature_checking))
1549
1581
 
1550
1582
    def test_signatures_when_available(self):
1551
1583
        self.get_branch_config('/a/', global_config=sample_ignore_signatures)
1552
1584
        self.assertEqual(config.CHECK_IF_POSSIBLE,
1553
 
                         self.my_config.signature_checking())
 
1585
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1586
                             self.my_config.signature_checking))
1554
1587
 
1555
1588
    def test_signatures_always(self):
1556
1589
        self.get_branch_config('/b')
1557
1590
        self.assertEqual(config.CHECK_ALWAYS,
1558
 
                         self.my_config.signature_checking())
 
1591
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1592
                         self.my_config.signature_checking))
1559
1593
 
1560
1594
    def test_gpg_signing_command(self):
1561
1595
        self.get_branch_config('/b')
1562
 
        self.assertEqual("gnome-gpg", self.my_config.gpg_signing_command())
 
1596
        self.assertEqual("gnome-gpg",
 
1597
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1598
                self.my_config.gpg_signing_command))
1563
1599
 
1564
1600
    def test_gpg_signing_command_missing(self):
1565
1601
        self.get_branch_config('/a')
1566
 
        self.assertEqual("false", self.my_config.gpg_signing_command())
 
1602
        self.assertEqual("false",
 
1603
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1604
                self.my_config.gpg_signing_command))
1567
1605
 
1568
1606
    def test_gpg_signing_key(self):
1569
1607
        self.get_branch_config('/b')
1570
 
        self.assertEqual("DD4D5088", self.my_config.gpg_signing_key())
 
1608
        self.assertEqual("DD4D5088", self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1609
            self.my_config.gpg_signing_key))
1571
1610
 
1572
1611
    def test_gpg_signing_key_default(self):
1573
1612
        self.get_branch_config('/a')
1574
 
        self.assertEqual("erik@bagfors.nu", self.my_config.gpg_signing_key())
 
1613
        self.assertEqual("erik@bagfors.nu",
 
1614
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1615
                self.my_config.gpg_signing_key))
1575
1616
 
1576
1617
    def test_get_user_option_global(self):
1577
1618
        self.get_branch_config('/a')
1790
1831
    def test_signatures_forced(self):
1791
1832
        my_config = self.get_branch_config(
1792
1833
            global_config=sample_always_signatures)
1793
 
        self.assertEqual(config.CHECK_NEVER, my_config.signature_checking())
1794
 
        self.assertEqual(config.SIGN_ALWAYS, my_config.signing_policy())
1795
 
        self.assertTrue(my_config.signature_needed())
 
1834
        self.assertEqual(config.CHECK_NEVER,
 
1835
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1836
                my_config.signature_checking))
 
1837
        self.assertEqual(config.SIGN_ALWAYS,
 
1838
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1839
                my_config.signing_policy))
 
1840
        self.assertTrue(self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1841
            my_config.signature_needed))
1796
1842
 
1797
1843
    def test_signatures_forced_branch(self):
1798
1844
        my_config = self.get_branch_config(
1799
1845
            global_config=sample_ignore_signatures,
1800
1846
            branch_data_config=sample_always_signatures)
1801
 
        self.assertEqual(config.CHECK_NEVER, my_config.signature_checking())
1802
 
        self.assertEqual(config.SIGN_ALWAYS, my_config.signing_policy())
1803
 
        self.assertTrue(my_config.signature_needed())
 
1847
        self.assertEqual(config.CHECK_NEVER,
 
1848
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1849
                my_config.signature_checking))
 
1850
        self.assertEqual(config.SIGN_ALWAYS,
 
1851
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1852
                my_config.signing_policy))
 
1853
        self.assertTrue(self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1854
            my_config.signature_needed))
1804
1855
 
1805
1856
    def test_gpg_signing_command(self):
1806
1857
        my_config = self.get_branch_config(
1807
1858
            global_config=sample_config_text,
1808
1859
            # branch data cannot set gpg_signing_command
1809
1860
            branch_data_config="gpg_signing_command=pgp")
1810
 
        self.assertEqual('gnome-gpg', my_config.gpg_signing_command())
 
1861
        self.assertEqual('gnome-gpg',
 
1862
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1863
                my_config.gpg_signing_command))
1811
1864
 
1812
1865
    def test_get_user_option_global(self):
1813
1866
        my_config = self.get_branch_config(global_config=sample_config_text)