← Back to branch summary

~fginther/landscape-charm/use-host-series

« back to all changes in this revision

Viewing changes to lib/tests/test_apt.py

  • Committer: Landscape Builder
  • Author(s): Free Ekanayaka
  • Date: 2016-05-06 16:02:16 UTC
  • mfrom: (348.1.4 pull-python-2-in-install-hook)
  • Revision ID: landscape_builder-20160506160216-xqjhzcr4yp5irttt
Merge pull-python-2-in-install-hook [f=1578386] [r=benji,tribaal,landscape-builder] [a=Free Ekanayaka]
This branch modifies the landscape-server charm minimally to get it
working on xenial units.

The change ports the install hook (and related tests) to python 3, so
we can install python 2 along with our regular dependencies.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/tests/test_apt.py
126
126
        """
127
127
        self.hookenv.config()["source"] = "15.11, ppa:juju/devel"
128
128
        self.apt.set_sources()
129
 
        self.assertItemsEqual(
 
129
        self.assertEqual(
130
130
            [("ppa:landscape/15.11", None), ("ppa:juju/devel", None)],
131
131
            self.fetch.sources)
132
132
 
138
138
        self.hookenv.config()["source"] = "15.11, deb http://host/ ./"
139
139
        self.hookenv.config()["key"] = "null, xyz"
140
140
        self.apt.set_sources()
141
 
        self.assertItemsEqual(
 
141
        self.assertEqual(
142
142
            [("ppa:landscape/15.11", None), ("deb http://host/ ./", "xyz")],
143
143
            self.fetch.sources)
144
144
 
235
235
        installed.
236
236
        """
237
237
        self.assertEqual(
238
 
            ("landscape-server", "landscape-hashids", "python-psutil"),
 
238
            ("landscape-server", "landscape-hashids", "python-minimal",
 
239
             "python-psutil"),
239
240
            INSTALL_PACKAGES)
240
241
 
241
242
    def test_install(self):