Merge lp:~psivaa/ubuntu-test-cases/desktop_de into lp:~javier.collado/ubuntu-test-cases/desktop

[Para Siva]

This is to add German language default installation test. The test is almost identical to the standard (English) installation test except the locale and the location variation. Gernam specific script and the preseed files are added and the default (English) runlist is used. The tests succeed in the local run but fails right now on the QA lab due to an ubiquity bug, lp:1098577 which is now fix commited and awaiting release.

[Javier Collado (javier.collado)]

Isn't really very important, but comparing the default preseed and the one for
the German locale, I see this:

$ diff preseeds/default{,_de}.cfg
21c21
< d-i debian-installer/locale string en_US.UTF-8
---
> d-i debian-installer/locale string de_DE.UTF-8
30c30
< d-i time/zone string Etc/UTC
---
> d-i time/zone string US/Eastern

I don't think the time zone has any effect in the test case, but I guess is
more appropriate to use a more common value like 'Europe/Berlin'.

[Para Siva (psivaa)]

Thanks for the comment. The timezone was selected to suite the location where the tests are run. In fact we would not have discovered the bug above (lp:1098577) had we used Europe/Berlin. So in my view use of US/Eastern is the best selection.

[lp:~psivaa/ubuntu-test-cases/desktop_de]

36. By Para Siva on 2013-01-18

Adding a post installation test to check for the correct archive location for non-English installations

37. By Para Siva on 2013-01-18

Adding runlist for german installation tests

38. By Para Siva on 2013-01-18

Adding the archive location test in tslist

[Para Siva (psivaa)]

Thanks for the conversation Javier regarding adding a post installation test to specifically test the archive location. The test has now been added now and a separate runlist, default_de.run has also been added with the added test. The tslist.run has also been edited to include the new test which was necessary for the local run.

review: Needs Resubmitting

[Max Brustkern (nuclearbob)]

This looks reasonable to me.

review: Approve

[Javier Collado (javier.collado)]

Looks good, thanks.

In the version I'm merging, I've applied a few changes to read sources file
just once and to fix a couple of pep8/pep257 warnings.

review: Approve

=== added file 'preseeds/default_de.cfg'
--- preseeds/default_de.cfg	1970-01-01 00:00:00 +0000
+++ preseeds/default_de.cfg	2013-01-18 17:54:21 +0000
@@ -0,0 +1,38 @@
+#
+# Copyright (C) 2010, Canonical Ltd (http://www.canonical.com/)
+#
+# This file is part of ubuntu-server-iso-testing.
+#
+# ubuntu-server-iso-testing is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# ubuntu-server-iso-testing is distributed in the hope that it will
+# be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with ubuntu-server-iso-testing.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
+d-i debian-installer/locale string de_DE.UTF-8
+d-i netcfg/get_hostname string utah-example
+d-i partman-auto/method string regular
+#need this for desktop
+d-i partman/choose_partition select Finish partitioning and write changes to disk
+#need this for cobbler
+d-i partman/confirm boolean true
+#need this for non-desktop
+d-i partman/confirm_nooverwrite boolean true
+d-i time/zone string US/Eastern
+d-i passwd/user-fullname string UTAH
+d-i passwd/username string utah
+d-i passwd/user-password password !ubuntu123
+d-i passwd/user-password-again password !ubuntu123
+d-i pkgsel/include string openssh-server python-yaml bzr git gdebi-core
+#need this for non-desktop
+d-i finish-install/reboot_in_progress note
+d-i preseed/late_command string  chroot /target sh -c 'chmod g+w /var/lib/utah/testsuites; apt-get install -y --force-yes imagemagick'; [ "$?" -eq "0" ]

=== added file 'runlists/default_de.run'
--- runlists/default_de.run	1970-01-01 00:00:00 +0000
+++ runlists/default_de.run	2013-01-18 17:54:21 +0000
@@ -0,0 +1,8 @@
+testsuites:
+  - name: usit
+    fetch_method: bzr-export
+    fetch_location: lp:~javier.collado/ubuntu-test-cases/desktop/testsuites/usit
+    include_tests:
+      - read_write
+      - dbus_machine_id
+      - archive_location

=== added file 'scripts/default_de.sh'
--- scripts/default_de.sh	1970-01-01 00:00:00 +0000
+++ scripts/default_de.sh	2013-01-18 17:54:21 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Run default scenario
+SCRIPT_DIR=$(readlink -e $(dirname $0))
+BRANCH_DIR=${BRANCH_DIR:-lp:~javier.collado/ubuntu-test-cases/desktop}
+PRESEED=$BRANCH_DIR/preseeds/default_de.cfg
+RUNLIST=$BRANCH_DIR/runlists/default_de.run
+
+. $SCRIPT_DIR/base.sh
+parse_args "$@"
+echo $CMD

=== added directory 'testsuites/usit/archive_location'
=== added file 'testsuites/usit/archive_location/tc_control'
--- testsuites/usit/archive_location/tc_control	1970-01-01 00:00:00 +0000
+++ testsuites/usit/archive_location/tc_control	2013-01-18 17:54:21 +0000
@@ -0,0 +1,9 @@
+description: Sources.list should match archive according to the timezone
+dependencies: none
+action: |
+ 1. Check if the archive location matches the timezone and not the locale
+expected_results: |
+ 1. Archive location matches the timezone and not the locale
+type: userland
+command: ./test.py
+run_as: utah

=== added file 'testsuites/usit/archive_location/test.py'
--- testsuites/usit/archive_location/test.py	1970-01-01 00:00:00 +0000
+++ testsuites/usit/archive_location/test.py	2013-01-18 17:54:21 +0000
@@ -0,0 +1,51 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2013, Canonical Ltd (http://www.canonical.com/)
+#
+# This file is part of ubuntu-test-cases.
+#
+# ubuntu-test-cases is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# ubuntu-test-cases is distributed in the hope that it will
+# be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with ubuntu-test-cases.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+"""Archive location should only match the timezone and not the locale"""
+
+import logging
+import os.path
+import unittest
+
+
+class ArchiveLocationTest(unittest.TestCase):
+    SOURCES_FILE = '/etc/apt/sources.list'
+
+    # Timezone is US/Eastern. Hence correct archive is us.archive.ubuntu.com
+    # de.archive.ubuntu.com is incorrect even when the locale is de_DE.UTF-8
+    RIGHT_LOC = 'us.archive.ubuntu.com'
+    WRONG_LOC = 'de.archive.ubuntu.com'
+
+    def test_archive_location(self):
+        """Test sources.list contains correct archive settings"""
+        logging.info('Checking that arcive location is ({!r})'
+                     .format(self.RIGHT_LOC))
+        self.assertTrue(self.RIGHT_LOC in open(self.SOURCES_FILE).read(),
+                        'Archive is not US specific')
+
+        logging.info('Checking that arcive location is NOT ({!r})'
+                     .format(self.WRONG_LOC))
+        self.assertTrue(self.WRONG_LOC not in open(self.SOURCES_FILE).read(),
+                        'Archive is set according to locale - German')
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.DEBUG,
+                        format='%(levelname)s: %(message)s')
+    unittest.main()

=== modified file 'testsuites/usit/tslist.run'
--- testsuites/usit/tslist.run	2013-01-03 23:32:23 +0000
+++ testsuites/usit/tslist.run	2013-01-18 17:54:21 +0000
@@ -11,3 +11,4 @@
 - test: total_disk
 - test: disk_not_full
 - test: out_of_memory
+- test: archive_location