Merge lp:~smartboyhw/testdrive/lp-fix-ubuntukylin-1170617 into lp:testdrive

[Howard Chan]

This enables Testdrive to test UbuntuKylin ISOs and fixes LP: #1170617

[Andres Rodriguez (andreserl)]

Howdy,

I made a quick review and found that:

1. No ISO's are displayed, could you please check that the ISO's are indeed available and that they are made available to TestDrive too?

2. Labels say 'UbuntuKylin' when they should say 'Ubuntu Kylin'. Please get that fixed.

Thanks.

review: Needs Fixing

[Jackson Doak (noskcaj)]

You also need to add reference to kylin in the testdrive.1 file (the documentation file)

[Howard Chan (smartboyhw)]

UbuntuKylin is indeed it's correct name… And that's strange when it doesn't
load the Kylin ISOs.

I won't have time to fix so maybe Jackson can fix it for me.
On 2013-5-23 上午6:47, "Jackson Doak" <email address hidden> wrote:

> You also need to add reference to kylin in the testdrive.1 file (the
> documentation file)
> --
>
> https://code.launchpad.net/~smartboyhw/testdrive/lp-fix-ubuntukylin-1170617/+merge/159968
> You are the owner of lp:~smartboyhw/testdrive/lp-fix-ubuntukylin-1170617.
>

[Jackson Doak (noskcaj)]

ok, i'll branch it and have a look

On Thu, May 23, 2013 at 9:13 AM, Howard Chan <email address hidden> wrote:

> UbuntuKylin is indeed it's correct name… And that's strange when it doesn't
> load the Kylin ISOs.
>
> I won't have time to fix so maybe Jackson can fix it for me.
> On 2013-5-23 上午6:47, "Jackson Doak" <email address hidden> wrote:
>
> > You also need to add reference to kylin in the testdrive.1 file (the
> > documentation file)
> > --
> >
> >
> https://code.launchpad.net/~smartboyhw/testdrive/lp-fix-ubuntukylin-1170617/+merge/159968
> > You are the owner of lp:~smartboyhw/testdrive/lp-fix-ubuntukylin-1170617.
> >
>
> --
>
> https://code.launchpad.net/~smartboyhw/testdrive/lp-fix-ubuntukylin-1170617/+merge/159968
> You are subscribed to branch
> lp:~smartboyhw/testdrive/lp-fix-ubuntukylin-1170617.
>

=== modified file 'bin/testdrive'
--- bin/testdrive	2012-04-21 02:05:42 +0000
+++ bin/testdrive	2013-04-21 08:04:25 +0000
@@ -194,7 +194,7 @@
         help=_('hardcode Ubuntu RELEASE codename'))
     parser.add_option('-l', '--flavor', action='store', type='string', dest='flavor',
         help=_('hardcode Ubuntu flavor. Available Flavors:\n\
-             ubuntu/kubuntu/xubuntu/edubuntu/mythbuntu/ubuntustudio/lubuntu'))
+             ubuntu/kubuntu/xubuntu/edubuntu/mythbuntu/ubuntustudio/lubuntu/ubuntukylin'))
     parser.add_option('-p', '--repo', action='store', type='string', dest='repository',
         help=_('hardcode Ubuntu repository from where to obtain ISOs:\n\
              releases/cdimage/cloud-daily/cloud-releases'))

=== modified file 'bin/testdrive-gtk'
--- bin/testdrive-gtk	2013-04-16 23:53:30 +0000
+++ bin/testdrive-gtk	2013-04-21 08:04:25 +0000
@@ -45,6 +45,7 @@
 TAB_LABEL.append({"dist":"mythbuntu", "label":"Mythbuntu"})
 TAB_LABEL.append({"dist":"ubuntustudio", "label":"Ubuntu Studio"})
 TAB_LABEL.append({"dist":"lubuntu", "label":"Lubuntu"})
+TAB_LABEL.append({"dist":"ubuntukylin", "label":"UbuntuKylin"})
 TAB_LABEL.append({"dist":"other", "label":_("Other")})
 
 global ISOLIST

=== modified file 'data/ui/PreferencesTestdrivegtkDialog.ui'
--- data/ui/PreferencesTestdrivegtkDialog.ui	2011-08-17 21:05:48 +0000
+++ data/ui/PreferencesTestdrivegtkDialog.ui	2013-04-21 08:04:25 +0000
@@ -974,6 +974,21 @@
                                       </packing>
                                     </child>
                                     <child>
+                                      <object class="GtkCheckButton" id="chk_flavor_ubuntukylin">
+                                        <property name="label" translatable="yes">UbuntuKylin</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">7</property>
+                                      </packing>
+                                    </child>
+                                    <child>
                                       <object class="GtkCheckButton" id="chk_flavor_other">
                                         <property name="label" translatable="yes">Other</property>
                                         <property name="visible">True</property>
@@ -985,7 +1000,7 @@
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
-                                        <property name="position">7</property>
+                                        <property name="position">8</property>
                                       </packing>
                                     </child>
                                   </object>

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-18 16:22:50 +0000
+++ debian/changelog	2013-04-21 08:04:25 +0000
@@ -1,8 +1,11 @@
-testdrive (3.21) unreleased; urgency=low
+testdrive (3.21-0ubuntu1) UNRELEASED; urgency=low
 
   [ Paolo Rotolo ]
   * debian/control: Add usb-cretor-gtk to recommends. (LP: #962250)
 
+  [ Howard Chan ]
+  * Add UbuntuKylin to Testdrive. (LP: #1170617)
+
  -- Dustin Kirkland <[e-mail]>  Thu, 18 Apr 2013 11:22:39 -0500
 
 testdrive (3.20-0ubuntu1) raring; urgency=low

=== modified file 'testdrive/testdrive.py'
--- testdrive/testdrive.py	2013-04-16 05:45:33 +0000
+++ testdrive/testdrive.py	2013-04-21 08:04:25 +0000
@@ -114,6 +114,8 @@
                     category = 'kubuntu'
                 elif category == 'kubuntu-active':
                     category = 'kubuntu'
+                elif category == 'ubuntukylin':
+                    category = 'UbuntuKylin'
                 flavor = iso.split()[0].capitalize()
                 if flavor == 'Ubuntu-netbook':
                     flavor = 'Ubuntu'
@@ -129,6 +131,8 @@
                     flavor = 'Ubuntu Studio'
                 elif flavor == 'Ubuntu-server':
                     flavor = 'Ubuntu'
+                elif flavor == 'Ubuntukylin':
+                    flavor = 'UbuntuKylin'
                 elif flavor == 'Cloud-server':
                     flavor = 'Cloud Server'
                 elif flavor == 'Cloud-desktop':

=== modified file 'testdrivegtk/PreferencesTestdrivegtkDialog.py'
--- testdrivegtk/PreferencesTestdrivegtkDialog.py	2012-04-21 02:22:27 +0000
+++ testdrivegtk/PreferencesTestdrivegtkDialog.py	2013-04-21 08:04:25 +0000
@@ -197,6 +197,8 @@
         self.chk_flavor_ubuntustudio.connect("clicked", self.on_select_flavors)
         self.chk_flavor_lubuntu = self.builder.get_object("chk_flavor_lubuntu")
         self.chk_flavor_lubuntu.connect("clicked", self.on_select_flavors)
+        self.chk_flavor_ubuntukylin = self.builder.get_object("chk_flavor_ubuntukylin")
+        self.chk_flavor_ubuntukylin.connect("clicked", self.on_select_flavors)
         self.chk_flavor_other = self.builder.get_object("chk_flavor_other")
         self.chk_flavor_other.connect("clicked", self.on_select_flavors)
 
@@ -292,6 +294,8 @@
                     self.chk_flavor_ubuntustudio.set_active(True)
                 elif flavor == 'lubuntu':
                     self.chk_flavor_lubuntu.set_active(True)
+                elif flavor == 'ubuntukylin':
+                    self.chk_flavor_ubuntukylin.set_active(True)
                 elif flavor == 'other':
                     self.chk_flavor_other.set_active(True)
                 else:
@@ -435,6 +439,8 @@
             self.flavors = self.flavors + "ubuntustudio, "
         if self.chk_flavor_lubuntu.get_active():
             self.flavors = self.flavors + "lubuntu, "
+        if self.chk_flavor_ubuntukylin.get_active():
+            self.flavors = self.flavors + "ubuntukylin, "
         if self.chk_flavor_other.get_active():
             self.flavors = self.flavors + "other, "
 

=== modified file 'testdriverc'
--- testdriverc	2011-10-31 15:36:17 +0000
+++ testdriverc	2013-04-21 08:04:25 +0000
@@ -68,7 +68,7 @@
 
 # The following line determines the default Ubuntu Flavor used by TestDrive.
 # Possible flavors are: 
-# ubuntu/kubuntu/xubuntu/edubuntu/mythbuntu/ubuntustudio/lubuntu/cloud-server/cloud-desktop
+# ubuntu/kubuntu/xubuntu/edubuntu/mythbuntu/ubuntustudio/lubuntu/cloud-server/cloud-desktop/ubuntukylin
 f = ubuntu
 
 # Section for TestDrive GTK specific variables.
@@ -76,5 +76,5 @@
 
 # The following line determines the default Ubuntu Flavors used by TestDrive GTK.
 # Possible flavors are:
-# ubuntu/kubuntu/xubuntu/edubuntu/mythbuntu/ubuntustudio/lubuntu
+# ubuntu/kubuntu/xubuntu/edubuntu/mythbuntu/ubuntustudio/lubuntu/ubuntukylin
 f = ubuntu, kubuntu, xubuntu