← Back to branch summary

~xubuntu-dev/ubuntu-cdimage/xubuntu-base

« back to all changes in this revision

Viewing changes to lib/cdimage/tests/test_germinate.py

  • Committer: Sean Davis
  • Date: 2018-06-02 00:21:13 UTC
  • mfrom: (1559.1.177 cdimage)
  • Revision ID: smd.seandavis@gmail.com-20180602002113-utt3lq0t65i43cmf
Merge lp:ubuntu-cdimage revno 1736, add optional project param to _guess_image_type to disambiguate

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/cdimage/tests/test_germinate.py
82
82
 
83
83
    def test_seed_sources_bzr(self):
84
84
        for project, series, owners in (
85
 
            ("ubuntu", "raring", ["ubuntu-core-dev"]),
86
85
            ("kubuntu", "natty", ["ubuntu-core-dev"]),
87
 
            ("kubuntu", "oneiric", ["kubuntu-dev", "ubuntu-core-dev"]),
 
86
            ("kubuntu", "oneiric", ["kubuntu-dev"]),
88
87
            ("kubuntu-active", "natty", ["ubuntu-core-dev"]),
89
 
            ("kubuntu-active", "oneiric", ["kubuntu-dev", "ubuntu-core-dev"]),
90
 
            ("kubuntu-plasma5", "utopic", ["kubuntu-dev", "ubuntu-core-dev"]),
 
88
            ("kubuntu-active", "oneiric", ["kubuntu-dev"]),
 
89
            ("kubuntu-plasma5", "utopic", ["kubuntu-dev"]),
91
90
            ("ubuntustudio", "raring",
92
 
             ["ubuntustudio-dev", "ubuntu-core-dev"]),
93
 
            ("mythbuntu", "raring", ["mythbuntu-dev", "ubuntu-core-dev"]),
 
91
             ["ubuntustudio-dev"]),
 
92
            ("mythbuntu", "raring", ["mythbuntu-dev"]),
94
93
            ("xubuntu", "hardy", ["ubuntu-core-dev"]),
95
 
            ("xubuntu", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),
96
 
            ("xubuntu-base", "bionic", ["xubuntu-dev", "ubuntu-core-dev"]),
97
94
            ("ubuntu-gnome", "raring",
98
 
             ["ubuntu-gnome-dev", "ubuntu-core-dev"]),
 
95
             ["ubuntu-gnome-dev"]),
99
96
            ("ubuntu-budgie", "zesty",
100
 
             ["ubuntubudgie-dev", "ubuntu-core-dev"]),
 
97
             ["ubuntubudgie-dev"]),
101
98
            ("ubuntu-mate", "vivid",
102
 
             ["ubuntu-mate-dev", "ubuntu-core-dev"]),
103
 
            ("ubuntu-moblin-remix", "hardy", ["moblin", "ubuntu-core-dev"]),
 
99
             ["ubuntu-mate-dev"]),
 
100
            ("ubuntu-moblin-remix", "hardy", ["moblin"]),
104
101
            ("ubuntukylin", "trusty", ["ubuntu-core-dev"]),
105
 
            ("ubuntukylin", "utopic",
106
 
             ["ubuntukylin-members", "ubuntu-core-dev"]),
107
102
        ):
108
103
            self.config["DIST"] = series
109
104
            sources = [
110
105
                "http://bazaar.launchpad.net/~%s/ubuntu-seeds/" % owner
111
106
                for owner in owners]
 
107
            sources.append(
 
108
                "https://git.launchpad.net/~ubuntu-core-dev/"
 
109
                "ubuntu-seeds/+git/")
112
110
            self.assertEqual(sources, self.germination.seed_sources(project))
113
111
 
114
112
        for project, series, owners in (
115
 
            ("lubuntu", "raring", ["lubuntu-dev"]),
 
113
            ("ubuntu", "raring", ["ubuntu-core-dev"]),
 
114
            ("lubuntu", "raring", ["lubuntu-dev", "ubuntu-core-dev"]),
 
115
            ("xubuntu", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),
 
116
            ("xubuntu-base", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),
 
117
            ("ubuntukylin", "utopic", ["ubuntukylin-members", "ubuntu-core-dev"]),
116
118
        ):
117
119
            self.config["DIST"] = series
118
120
            sources = [
119
121
                "https://git.launchpad.net/~%s/ubuntu-seeds/+git/" % owner
120
122
                for owner in owners]
121
 
            if "ubuntu-core-dev" not in owners:
122
 
                sources.append(
123
 
                    "http://bazaar.launchpad.net/~ubuntu-core-dev/"
124
 
                    "ubuntu-seeds/")
125
123
            self.assertEqual(sources, self.germination.seed_sources(project))
126
124
 
127
125
    def test_seed_sources_non_bzr(self):
257
255
        expected_command = [
258
256
            germinate_path,
259
257
            "--seed-source",
260
 
            "http://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/",
 
258
            "https://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/",
261
259
            "--mirror", "file://%s/" % output_dir,
262
260
            "--seed-dist", "ubuntu.raring",
263
261
            "--dist", "raring,raring-security,raring-updates",