~therve/landscape-client/download-script-attachments

« back to all changes in this revision

Viewing changes to landscape/package/tests/test_releaseupgrader.py

Merged apt-facade-remaining-tests [r=fwierzbicki,therve] [f=890605,890606].

Make sure that ReleaseUpgrader and PackageTaskHandler tests can be run
with AptFacade instead of SmartFacade.

For ReleaseUpgrader I simply remove the setup of a facade, since the
facade isn't used by ReleaseUpgrader.

For PackageTaskHandler I made a change to AptFacade to be able to set
the architecture to None. This makes the PackageTaskHandler tests pass,
if I change them to use AptFacadeHelper instead of SmartFacadeHelper.

I didn't bother actually running the tests for both SmartFacade and
AptFacade, since the changes are minimal. When the time comes to remove
SmartFacade we can change it to use AptFacadeHelper, without changing
anything else.

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
    ReleaseUpgrader, ReleaseUpgraderConfiguration, main)
15
15
from landscape.tests.helpers import (
16
16
    LandscapeTest, BrokerServiceHelper, LogKeeperHelper, EnvironSaverHelper)
17
 
from landscape.package.tests.helpers import SmartFacadeHelper
18
17
from landscape.manager.manager import SUCCEEDED, FAILED
19
18
 
20
19
 
33
32
 
34
33
class ReleaseUpgraderTest(LandscapeTest):
35
34
 
36
 
    helpers = [LogKeeperHelper, SmartFacadeHelper,
 
35
    helpers = [LogKeeperHelper,
37
36
               EnvironSaverHelper, BrokerServiceHelper]
38
37
 
39
38
    def setUp(self):
44
43
            os.mkdir(self.config.package_directory)
45
44
            os.mkdir(self.config.upgrade_tool_directory)
46
45
            self.store = PackageStore(self.makeFile())
47
 
            self.upgrader = ReleaseUpgrader(self.store, self.facade,
 
46
            self.upgrader = ReleaseUpgrader(self.store, None,
48
47
                                            self.remote, self.config)
49
48
            service = self.broker_service
50
49
            service.message_store.set_accepted_types(["operation-result"])