← Back to branch summary

~free.ekanayaka/landscape-client/lucid-1.4.4-0ubuntu0.10.04

« back to all changes in this revision

Viewing changes to landscape/tests/test_configuration.py

  • Committer: Bazaar Package Importer
  • Author(s): Free Ekanayaka
  • Date: 2009-12-16 10:50:05 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20091216105005-svplwdorkgz6vja7
Tags: 1.4.0-0ubuntu0.10.04.0
https://launchpad.net/bugs/456124
https://launchpad.net/bugs/340843
https://launchpad.net/bugs/450629
https://launchpad.net/bugs/455217
https://launchpad.net/bugs/462543
https://launchpad.net/bugs/463321
* New upstream release with several bug fixes:
  - Fix landscape daemons fail to start when too many groups are
    available (LP: #456124)
  - Fix landscape programs wake up far too much. (LP: #340843)
  - Fix Package manager fails with 'no such table: task' (LP #465846)
  - Fix test suite leaving temporary files around (LP #476418)
  - Fix the 1hr long wait for user data to be uploaded following a
    resynchronisation (LP #369000)

* Add support for Ubuntu release upgrades:
  - Add helper function to fetch many files at once (LP: #450629)
  - Handle release-upgrade messages in the packagemanager
    plugin (LP: #455217)
  - Add a release-upgrader task handler (LP: #462543)
  - Support upgrade-tool environment variables (LP: #463321)

* Add initial support for Smart package locking:
  - Detect and report changes about Smart package locks (#488108)

* Packaging fixes:
  - Turn unnecessary Pre-Depends on python-gobject into a regular Depends
  - If it's empty, remove /etc/landscape upon purge

Show diffs side-by-side

added added

removed removed

Lines of Context:
landscape/tests/test_configuration.py
1258
1258
 
1259
1259
        config_filename = self.makeFile("")
1260
1260
        key_filename = config_filename + ".ssl_public_key"
 
1261
        self.addCleanup(os.remove, key_filename)
1261
1262
 
1262
1263
        print_text_mock = self.mocker.replace(print_text)
1263
1264
        print_text_mock("Writing SSL public key to %s..." % key_filename)
1352
1353
        config_mock = self.mocker.replace(service.config)
1353
1354
        print_text_mock = self.mocker.replace(print_text)
1354
1355
        reactor_mock = self.mocker.proxy("twisted.internet.reactor")
1355
 
        install_mock = self.mocker.replace("twisted.internet."
1356
 
                                           "glib2reactor.install")
 
1356
        install_mock = self.mocker.replace("landscape.reactor.install")
1357
1357
 
1358
1358
        # This must necessarily happen in the following order.
1359
1359
        self.mocker.order()
1410
1410
        config_mock = self.mocker.replace(service.config)
1411
1411
        print_text_mock = self.mocker.replace(print_text)
1412
1412
        reactor_mock = self.mocker.proxy("twisted.internet.reactor")
1413
 
        install_mock = self.mocker.replace("twisted.internet."
1414
 
                                           "glib2reactor.install")
 
1413
        install_mock = self.mocker.replace("landscape.reactor.install")
1415
1414
 
1416
1415
        # This must necessarily happen in the following order.
1417
1416
        self.mocker.order()
1467
1466
        config_mock = self.mocker.replace(service.config)
1468
1467
        print_text_mock = self.mocker.replace(print_text)
1469
1468
        reactor_mock = self.mocker.proxy("twisted.internet.reactor")
1470
 
        install_mock = self.mocker.replace("twisted.internet."
1471
 
                                           "glib2reactor.install")
 
1469
        install_mock = self.mocker.replace("landscape.reactor.install")
1472
1470
 
1473
1471
        # This must necessarily happen in the following order.
1474
1472
        self.mocker.order()
1526
1524
        config_mock = self.mocker.replace(service.config)
1527
1525
        print_text_mock = self.mocker.replace(print_text)
1528
1526
        reactor_mock = self.mocker.proxy("twisted.internet.reactor")
1529
 
        install_mock = self.mocker.replace("twisted.internet."
1530
 
                                           "glib2reactor.install")
 
1527
        install_mock = self.mocker.replace("landscape.reactor.install")
1531
1528
 
1532
1529
        # This must necessarily happen in the following order.
1533
1530
        self.mocker.order()
1573
1570
        remote_broker_factory = self.mocker.replace(
1574
1571
            "landscape.broker.remote.RemoteBroker", passthrough=False)
1575
1572
        print_text_mock = self.mocker.replace(print_text)
1576
 
        install_mock = self.mocker.replace("twisted.internet."
1577
 
                                           "glib2reactor.install")
 
1573
        install_mock = self.mocker.replace("landscape.reactor.install")
1578
1574
        time_mock = self.mocker.replace("time")
1579
1575
 
1580
1576
        install_mock()
1603
1599
        remote_broker_factory = self.mocker.replace(
1604
1600
            "landscape.broker.remote.RemoteBroker", passthrough=False)
1605
1601
        print_text_mock = self.mocker.replace(print_text)
1606
 
        install_mock = self.mocker.replace("twisted.internet."
1607
 
                                           "glib2reactor.install")
 
1602
        install_mock = self.mocker.replace("landscape.reactor.install")
1608
1603
        time_mock = self.mocker.replace("time")
1609
1604
 
1610
1605
        install_mock()
1642
1637
        """
1643
1638
        print_text_mock = self.mocker.replace(print_text)
1644
1639
        reactor_mock = self.mocker.proxy("twisted.internet.reactor")
1645
 
        install_mock = self.mocker.replace("twisted.internet."
1646
 
                                           "glib2reactor.install")
 
1640
        install_mock = self.mocker.replace("landscape.reactor.install")
1647
1641
 
1648
1642
        install_mock()
1649
1643
        print_text_mock("Please wait... ", "")
1678
1672
 
1679
1673
        print_text_mock = self.mocker.replace(print_text)
1680
1674
        reactor_mock = self.mocker.proxy("twisted.internet.reactor")
1681
 
        install_mock = self.mocker.replace("twisted.internet."
1682
 
                                           "glib2reactor.install")
 
1675
        install_mock = self.mocker.replace("landscape.reactor.install")
1683
1676
        # This is unordered. It's just way too much of a pain.
1684
1677
 
1685
1678
        install_mock()