Merge lp:~patrickmwright/ubuntu-server-iso-testing/run-test-isoname into lp:ubuntu-server-iso-testing

[Patrick Wright]

* added new option to run-tests to run any iso name in the associated ~/isos dir
* corrected kernel sru virtual-proposed preseed
* refactored kernel sru tests
 i. moved ltp install to tests setUp - ltp was not installing correctly for lucid and this fix works for all releases
 ii. added a forced dist-upgrade for -proposed tests

=== modified file 'run-test.py'
--- run-test.py	2011-06-26 14:06:40 +0000
+++ run-test.py	2011-07-28 18:16:04 +0000
@@ -95,6 +95,8 @@
                   help="location to store iso images (default=%s)" % DEFAULT_ISOROOT)
 parser.add_option("-f", "--flavor",  dest="flavor", default=DEFAULT_FLAVOR, 
                   help="flavor of Ubuntu to download (default=%s)" % DEFAULT_FLAVOR)
+parser.add_option("-n", "--isoname",  dest="isoname", default=False,
+                  help="specify name of a local iso file")  
 
 (options, args) = parser.parse_args()
 if options.debug:
@@ -170,7 +172,11 @@
 # Check and Download ISO if need be.
 
 # Create useful handles to ISO location
-iso_name = options.release + '-' + options.variant + '-' + options.arch + '.iso'
+if options.isoname:
+    iso_name = options.isoname
+else: 
+    iso_name = options.release + '-' + options.variant + '-' + options.arch + '.iso'
+
 iso_dir = options.flavor
 iso_location = os.path.join(options.isoroot, iso_dir, iso_name)
 

=== modified file 'templates.kernel/test_cases/generic-proposed/test'
--- templates.kernel/test_cases/generic-proposed/test	2011-07-13 04:42:32 +0000
+++ templates.kernel/test_cases/generic-proposed/test	2011-07-28 18:16:04 +0000
@@ -8,21 +8,29 @@
 logging.basicConfig(level=logging.DEBUG)
 
 class ltpTest(unittest.TestCase):
-        
-    def testLTPlite(self):
+
+    def runcmd(self, cmdargs):
+        logging.debug ('running %s' % cmdargs)
+        Test = subprocess.Popen (cmdargs,
+             stdout=subprocess.PIPE,
+             stderr=subprocess.PIPE)
+        (stdout, stderr) = Test.communicate ()
+        logging.info ('%s' % stdout)
+        logging.info ('%s' % stderr)
+        return Test
+
+    def setUp(self):
+        self.runcmd(['apt-get', 'update'])
+        self.runcmd(['apt-get', 'dist-upgrade','-y'])
+        self.runcmd(['apt-get', 'install', 'ltp', '-y'])
         # hack: at least for ltp-lite:
         os.makedirs ('/usr/lib/ltp/results/')
         os.makedirs ('/usr/lib/ltp/tools/pan')
         os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
         # end hack
-        logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')
-        Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',
-            '-f ltplite'],
-             stdout=subprocess.PIPE,
-             stderr=subprocess.PIPE)
-        (stdout, stderr) = Test.communicate ()
-        logging.info ('%s' % stdout)
-        logging.info ('%s' % stderr)
+        
+    def testLTPlite(self):
+        Test = self.runcmd(['/usr/lib/ltp/tools/runltp', '-f ltplite'])
         self.assertEqual(Test.returncode, 0)
 
 if __name__ == '__main__':

=== modified file 'templates.kernel/test_cases/generic/test'
--- templates.kernel/test_cases/generic/test	2011-06-14 12:21:43 +0000
+++ templates.kernel/test_cases/generic/test	2011-07-28 18:16:04 +0000
@@ -8,22 +8,28 @@
 logging.basicConfig(level=logging.DEBUG)
 
 class ltpTest(unittest.TestCase):
-        
-    def testLTPlite(self):
+
+    def runcmd(self, cmdargs):
+        logging.debug ('running %s' % cmdargs)
+        Test = subprocess.Popen (cmdargs,
+             stdout=subprocess.PIPE,
+             stderr=subprocess.PIPE)
+        (stdout, stderr) = Test.communicate ()
+        logging.info ('%s' % stdout)
+        logging.info ('%s' % stderr)
+        return Test
+
+    def setUp(self):
+        self.runcmd(['apt-get', 'install', 'ltp', '-y'])
         # hack: at least for ltp-lite:
         os.makedirs ('/usr/lib/ltp/results/')
         os.makedirs ('/usr/lib/ltp/tools/pan')
         os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
         # end hack
-        logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')
-        Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',
-            '-f ltplite'],
-             stdout=subprocess.PIPE,
-             stderr=subprocess.PIPE)
-        (stdout, stderr) = Test.communicate ()
-        logging.info ('%s' % stdout)
-        logging.info ('%s' % stderr)
+        
+    def testLTPlite(self):
+        Test = self.runcmd(['/usr/lib/ltp/tools/runltp', '-f ltplite'])
         self.assertEqual(Test.returncode, 0)
-
+        
 if __name__ == '__main__':
     unittest.main()

=== modified file 'templates.kernel/test_cases/server-proposed/test'
--- templates.kernel/test_cases/server-proposed/test	2011-07-13 04:42:32 +0000
+++ templates.kernel/test_cases/server-proposed/test	2011-07-28 18:16:04 +0000
@@ -8,21 +8,29 @@
 logging.basicConfig(level=logging.DEBUG)
 
 class ltpTest(unittest.TestCase):
-        
-    def testLTPlite(self):
+
+    def runcmd(self, cmdargs):
+        logging.debug ('running %s' % cmdargs)
+        Test = subprocess.Popen (cmdargs,
+             stdout=subprocess.PIPE,
+             stderr=subprocess.PIPE)
+        (stdout, stderr) = Test.communicate ()
+        logging.info ('%s' % stdout)
+        logging.info ('%s' % stderr)
+        return Test
+
+    def setUp(self):
+        self.runcmd(['apt-get', 'update'])
+        self.runcmd(['apt-get', 'dist-upgrade','-y'])
+        self.runcmd(['apt-get', 'install', 'ltp', '-y'])
         # hack: at least for ltp-lite:
         os.makedirs ('/usr/lib/ltp/results/')
         os.makedirs ('/usr/lib/ltp/tools/pan')
         os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
         # end hack
-        logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')
-        Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',
-            '-f ltplite'],
-             stdout=subprocess.PIPE,
-             stderr=subprocess.PIPE)
-        (stdout, stderr) = Test.communicate ()
-        logging.info ('%s' % stdout)
-        logging.info ('%s' % stderr)
+        
+    def testLTPlite(self):
+        Test = self.runcmd(['/usr/lib/ltp/tools/runltp', '-f ltplite'])
         self.assertEqual(Test.returncode, 0)
 
 if __name__ == '__main__':

=== modified file 'templates.kernel/test_cases/server/test'
--- templates.kernel/test_cases/server/test	2011-06-14 12:21:43 +0000
+++ templates.kernel/test_cases/server/test	2011-07-28 18:16:04 +0000
@@ -8,21 +8,27 @@
 logging.basicConfig(level=logging.DEBUG)
 
 class ltpTest(unittest.TestCase):
-        
-    def testLTPlite(self):
+
+    def runcmd(self, cmdargs):
+        logging.debug ('running %s' % cmdargs)
+        Test = subprocess.Popen (cmdargs,
+             stdout=subprocess.PIPE,
+             stderr=subprocess.PIPE)
+        (stdout, stderr) = Test.communicate ()
+        logging.info ('%s' % stdout)
+        logging.info ('%s' % stderr)
+        return Test
+
+    def setUp(self):
+        self.runcmd(['apt-get', 'install', 'ltp', '-y'])
         # hack: at least for ltp-lite:
         os.makedirs ('/usr/lib/ltp/results/')
         os.makedirs ('/usr/lib/ltp/tools/pan')
         os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
         # end hack
-        logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')
-        Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',
-            '-f ltplite'],
-             stdout=subprocess.PIPE,
-             stderr=subprocess.PIPE)
-        (stdout, stderr) = Test.communicate ()
-        logging.info ('%s' % stdout)
-        logging.info ('%s' % stderr)
+        
+    def testLTPlite(self):
+        Test = self.runcmd(['/usr/lib/ltp/tools/runltp', '-f ltplite'])
         self.assertEqual(Test.returncode, 0)
 
 if __name__ == '__main__':

=== modified file 'templates.kernel/test_cases/virtual-proposed/preseed'
--- templates.kernel/test_cases/virtual-proposed/preseed	2011-07-19 17:06:29 +0000
+++ templates.kernel/test_cases/virtual-proposed/preseed	2011-07-28 18:16:04 +0000
@@ -20,6 +20,10 @@
 
 {% extends "base" %}
 
+{% block tasksel_first %}
+tasksel tasksel/skip-tasks string standard
+{% endblock %}
+
 {% block kernel_flavor %}
 d-i base-installer/kernel/override-image string linux-virtual
 {% endblock %}
@@ -30,6 +34,7 @@
 {% endblock %}
 
 {% block d_i_answers %}
+d-i base-installer/kernel/headers   boolean false
 postfix postfix/mailname        string  {{ hostname }}
 postfix postfix/tlsmgr_upgrade_warning  boolean
 postfix postfix/recipient_delim string  +
@@ -54,3 +59,4 @@
 {% block additional_repositories %}
 d-i apt-setup/proposed boolean true
 {% endblock %}
+

=== modified file 'templates.kernel/test_cases/virtual-proposed/test'
--- templates.kernel/test_cases/virtual-proposed/test	2011-07-13 04:42:32 +0000
+++ templates.kernel/test_cases/virtual-proposed/test	2011-07-28 18:16:04 +0000
@@ -8,21 +8,29 @@
 logging.basicConfig(level=logging.DEBUG)
 
 class ltpTest(unittest.TestCase):
-        
-    def testLTPlite(self):
+
+    def runcmd(self, cmdargs):
+        logging.debug ('running %s' % cmdargs)
+        Test = subprocess.Popen (cmdargs,
+             stdout=subprocess.PIPE,
+             stderr=subprocess.PIPE)
+        (stdout, stderr) = Test.communicate ()
+        logging.info ('%s' % stdout)
+        logging.info ('%s' % stderr)
+        return Test
+
+    def setUp(self):
+        self.runcmd(['apt-get', 'update'])
+        self.runcmd(['apt-get', 'dist-upgrade','-y'])
+        self.runcmd(['apt-get', 'install', 'ltp', '-y'])
         # hack: at least for ltp-lite:
         os.makedirs ('/usr/lib/ltp/results/')
         os.makedirs ('/usr/lib/ltp/tools/pan')
         os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
         # end hack
-        logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')
-        Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',
-            '-f ltplite'],
-             stdout=subprocess.PIPE,
-             stderr=subprocess.PIPE)
-        (stdout, stderr) = Test.communicate ()
-        logging.info ('%s' % stdout)
-        logging.info ('%s' % stderr)
+        
+    def testLTPlite(self):
+        Test = self.runcmd(['/usr/lib/ltp/tools/runltp', '-f ltplite'])
         self.assertEqual(Test.returncode, 0)
 
 if __name__ == '__main__':

=== modified file 'templates.kernel/test_cases/virtual/test'
--- templates.kernel/test_cases/virtual/test	2011-06-14 12:21:43 +0000
+++ templates.kernel/test_cases/virtual/test	2011-07-28 18:16:04 +0000
@@ -8,21 +8,27 @@
 logging.basicConfig(level=logging.DEBUG)
 
 class ltpTest(unittest.TestCase):
-        
-    def testLTPlite(self):
+
+    def runcmd(self, cmdargs):
+        logging.debug ('running %s' % cmdargs)
+        Test = subprocess.Popen (cmdargs,
+             stdout=subprocess.PIPE,
+             stderr=subprocess.PIPE)
+        (stdout, stderr) = Test.communicate ()
+        logging.info ('%s' % stdout)
+        logging.info ('%s' % stderr)
+        return Test
+
+    def setUp(self):
+        self.runcmd(['apt-get', 'install', 'ltp', '-y'])
         # hack: at least for ltp-lite:
         os.makedirs ('/usr/lib/ltp/results/')
         os.makedirs ('/usr/lib/ltp/tools/pan')
         os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
         # end hack
-        logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')
-        Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',
-            '-f ltplite'],
-             stdout=subprocess.PIPE,
-             stderr=subprocess.PIPE)
-        (stdout, stderr) = Test.communicate ()
-        logging.info ('%s' % stdout)
-        logging.info ('%s' % stderr)
+        
+    def testLTPlite(self):
+        Test = self.runcmd(['/usr/lib/ltp/tools/runltp', '-f ltplite'])
         self.assertEqual(Test.returncode, 0)
 
 if __name__ == '__main__':