← Back to branch summary

~ubuntu-branches/ubuntu/trusty/testdrive/trusty

« back to all changes in this revision

Viewing changes to testdrive/testdrive.py

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez
  • Date: 2013-04-16 09:40:46 UTC
  • mto: This revision was merged to the branch mainline in revision 54.
  • Revision ID: package-import@ubuntu.com-20130416094046-v3cjcx22nx617duy
Tags: upstream-3.19
Import upstream version 3.19

Show diffs side-by-side

added added

removed removed

Lines of Context:
testdrive/testdrive.py
112
112
                    category = 'kubuntu'
113
113
                elif category == 'kubuntu-mobile':
114
114
                    category = 'kubuntu'
 
115
                elif category == 'kubuntu-active':
 
116
                    category = 'kubuntu'
115
117
                flavor = iso.split()[0].capitalize()
116
118
                if flavor == 'Ubuntu-netbook':
117
119
                    flavor = 'Ubuntu'
121
123
                    flavor = 'Kubuntu'
122
124
                elif flavor == 'Kubuntu-mobile':
123
125
                    flavor = 'Kubuntu'
 
126
                elif flavor == 'Kubuntu-active':
 
127
                    flavor = 'Kubuntu Active'
124
128
                elif flavor == 'Ubuntustudio':
125
129
                    flavor = 'Ubuntu Studio'
126
130
                elif flavor == 'Ubuntu-server':
346
350
 
347
351
    def obtain_ubuntu_iso_list_from_repo(self):
348
352
        if self.p == 'cdimage':
349
 
            (status, output) = commands.getstatusoutput("wget -q -O- http://cdimage.ubuntu.com/.manifest-daily | egrep '(amd64|i386)'")
 
353
            (status, output) = commands.getstatusoutput("wget -q -O- http://cdimage.ubuntu.com/.manifest-daily | egrep '(amd64|i386)' | egrep '(current)'")
350
354
        elif self.p == 'releases':
351
355
            (status, output) = commands.getstatusoutput("wget -q -O- http://releases.ubuntu.com/.manifest | egrep '(amd64|i386)'")
352
356
        elif self.p == 'cloud-daily':