ubuntu-server-iso-testing

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

  1. run-test-isoname
  2. Merge into trunk
Proposed by Patrick Wright
Status: Merged
Merged at revision: 232
Proposed branch: lp:~patrickmwright/ubuntu-server-iso-testing/run-test-isoname
Merge into: lp:ubuntu-server-iso-testing
Diff against target: 313 lines (+116/-62)
8 files modified
run-test.py (+7/-1)
templates.kernel/test_cases/generic-proposed/test (+18/-10)
templates.kernel/test_cases/generic/test (+17/-11)
templates.kernel/test_cases/server-proposed/test (+18/-10)
templates.kernel/test_cases/server/test (+16/-10)
templates.kernel/test_cases/virtual-proposed/preseed (+6/-0)
templates.kernel/test_cases/virtual-proposed/test (+18/-10)
templates.kernel/test_cases/virtual/test (+16/-10)
To merge this branch: bzr merge lp:~patrickmwright/ubuntu-server-iso-testing/run-test-isoname
Reviewer Review Type Date Requested Status
Ubuntu Server Iso Testing Developers Pending
Review via email: mp+69703@code.launchpad.net

Description of the change

* 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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
95 help="location to store iso images (default=%s)" % DEFAULT_ISOROOT)95 help="location to store iso images (default=%s)" % DEFAULT_ISOROOT)
96parser.add_option("-f", "--flavor", dest="flavor", default=DEFAULT_FLAVOR, 96parser.add_option("-f", "--flavor", dest="flavor", default=DEFAULT_FLAVOR,
97 help="flavor of Ubuntu to download (default=%s)" % DEFAULT_FLAVOR)97 help="flavor of Ubuntu to download (default=%s)" % DEFAULT_FLAVOR)
98parser.add_option("-n", "--isoname", dest="isoname", default=False,
99 help="specify name of a local iso file")
98100
99(options, args) = parser.parse_args()101(options, args) = parser.parse_args()
100if options.debug:102if options.debug:
@@ -170,7 +172,11 @@
170# Check and Download ISO if need be.172# Check and Download ISO if need be.
171173
172# Create useful handles to ISO location174# Create useful handles to ISO location
173iso_name = options.release + '-' + options.variant + '-' + options.arch + '.iso'175if options.isoname:
176 iso_name = options.isoname
177else:
178 iso_name = options.release + '-' + options.variant + '-' + options.arch + '.iso'
179
174iso_dir = options.flavor180iso_dir = options.flavor
175iso_location = os.path.join(options.isoroot, iso_dir, iso_name)181iso_location = os.path.join(options.isoroot, iso_dir, iso_name)
176182
177183
=== 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 @@
8logging.basicConfig(level=logging.DEBUG)8logging.basicConfig(level=logging.DEBUG)
99
10class ltpTest(unittest.TestCase):10class ltpTest(unittest.TestCase):
11 11
12 def testLTPlite(self):12 def runcmd(self, cmdargs):
13 logging.debug ('running %s' % cmdargs)
14 Test = subprocess.Popen (cmdargs,
15 stdout=subprocess.PIPE,
16 stderr=subprocess.PIPE)
17 (stdout, stderr) = Test.communicate ()
18 logging.info ('%s' % stdout)
19 logging.info ('%s' % stderr)
20 return Test
21
22 def setUp(self):
23 self.runcmd(['apt-get', 'update'])
24 self.runcmd(['apt-get', 'dist-upgrade','-y'])
25 self.runcmd(['apt-get', 'install', 'ltp', '-y'])
13 # hack: at least for ltp-lite:26 # hack: at least for ltp-lite:
14 os.makedirs ('/usr/lib/ltp/results/')27 os.makedirs ('/usr/lib/ltp/results/')
15 os.makedirs ('/usr/lib/ltp/tools/pan')28 os.makedirs ('/usr/lib/ltp/tools/pan')
16 os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')29 os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
17 # end hack30 # end hack
18 logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')31
19 Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',32 def testLTPlite(self):
20 '-f ltplite'],33 Test = self.runcmd(['/usr/lib/ltp/tools/runltp', '-f ltplite'])
21 stdout=subprocess.PIPE,
22 stderr=subprocess.PIPE)
23 (stdout, stderr) = Test.communicate ()
24 logging.info ('%s' % stdout)
25 logging.info ('%s' % stderr)
26 self.assertEqual(Test.returncode, 0)34 self.assertEqual(Test.returncode, 0)
2735
28if __name__ == '__main__':36if __name__ == '__main__':
2937
=== 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 @@
8logging.basicConfig(level=logging.DEBUG)8logging.basicConfig(level=logging.DEBUG)
99
10class ltpTest(unittest.TestCase):10class ltpTest(unittest.TestCase):
11 11
12 def testLTPlite(self):12 def runcmd(self, cmdargs):
13 logging.debug ('running %s' % cmdargs)
14 Test = subprocess.Popen (cmdargs,
15 stdout=subprocess.PIPE,
16 stderr=subprocess.PIPE)
17 (stdout, stderr) = Test.communicate ()
18 logging.info ('%s' % stdout)
19 logging.info ('%s' % stderr)
20 return Test
21
22 def setUp(self):
23 self.runcmd(['apt-get', 'install', 'ltp', '-y'])
13 # hack: at least for ltp-lite:24 # hack: at least for ltp-lite:
14 os.makedirs ('/usr/lib/ltp/results/')25 os.makedirs ('/usr/lib/ltp/results/')
15 os.makedirs ('/usr/lib/ltp/tools/pan')26 os.makedirs ('/usr/lib/ltp/tools/pan')
16 os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')27 os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
17 # end hack28 # end hack
18 logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')29
19 Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',30 def testLTPlite(self):
20 '-f ltplite'],31 Test = self.runcmd(['/usr/lib/ltp/tools/runltp', '-f ltplite'])
21 stdout=subprocess.PIPE,
22 stderr=subprocess.PIPE)
23 (stdout, stderr) = Test.communicate ()
24 logging.info ('%s' % stdout)
25 logging.info ('%s' % stderr)
26 self.assertEqual(Test.returncode, 0)32 self.assertEqual(Test.returncode, 0)
2733
28if __name__ == '__main__':34if __name__ == '__main__':
29 unittest.main()35 unittest.main()
3036
=== 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 @@
8logging.basicConfig(level=logging.DEBUG)8logging.basicConfig(level=logging.DEBUG)
99
10class ltpTest(unittest.TestCase):10class ltpTest(unittest.TestCase):
11 11
12 def testLTPlite(self):12 def runcmd(self, cmdargs):
13 logging.debug ('running %s' % cmdargs)
14 Test = subprocess.Popen (cmdargs,
15 stdout=subprocess.PIPE,
16 stderr=subprocess.PIPE)
17 (stdout, stderr) = Test.communicate ()
18 logging.info ('%s' % stdout)
19 logging.info ('%s' % stderr)
20 return Test
21
22 def setUp(self):
23 self.runcmd(['apt-get', 'update'])
24 self.runcmd(['apt-get', 'dist-upgrade','-y'])
25 self.runcmd(['apt-get', 'install', 'ltp', '-y'])
13 # hack: at least for ltp-lite:26 # hack: at least for ltp-lite:
14 os.makedirs ('/usr/lib/ltp/results/')27 os.makedirs ('/usr/lib/ltp/results/')
15 os.makedirs ('/usr/lib/ltp/tools/pan')28 os.makedirs ('/usr/lib/ltp/tools/pan')
16 os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')29 os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
17 # end hack30 # end hack
18 logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')31
19 Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',32 def testLTPlite(self):
20 '-f ltplite'],33 Test = self.runcmd(['/usr/lib/ltp/tools/runltp', '-f ltplite'])
21 stdout=subprocess.PIPE,
22 stderr=subprocess.PIPE)
23 (stdout, stderr) = Test.communicate ()
24 logging.info ('%s' % stdout)
25 logging.info ('%s' % stderr)
26 self.assertEqual(Test.returncode, 0)34 self.assertEqual(Test.returncode, 0)
2735
28if __name__ == '__main__':36if __name__ == '__main__':
2937
=== 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 @@
8logging.basicConfig(level=logging.DEBUG)8logging.basicConfig(level=logging.DEBUG)
99
10class ltpTest(unittest.TestCase):10class ltpTest(unittest.TestCase):
11 11
12 def testLTPlite(self):12 def runcmd(self, cmdargs):
13 logging.debug ('running %s' % cmdargs)
14 Test = subprocess.Popen (cmdargs,
15 stdout=subprocess.PIPE,
16 stderr=subprocess.PIPE)
17 (stdout, stderr) = Test.communicate ()
18 logging.info ('%s' % stdout)
19 logging.info ('%s' % stderr)
20 return Test
21
22 def setUp(self):
23 self.runcmd(['apt-get', 'install', 'ltp', '-y'])
13 # hack: at least for ltp-lite:24 # hack: at least for ltp-lite:
14 os.makedirs ('/usr/lib/ltp/results/')25 os.makedirs ('/usr/lib/ltp/results/')
15 os.makedirs ('/usr/lib/ltp/tools/pan')26 os.makedirs ('/usr/lib/ltp/tools/pan')
16 os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')27 os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
17 # end hack28 # end hack
18 logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')29
19 Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',30 def testLTPlite(self):
20 '-f ltplite'],31 Test = self.runcmd(['/usr/lib/ltp/tools/runltp', '-f ltplite'])
21 stdout=subprocess.PIPE,
22 stderr=subprocess.PIPE)
23 (stdout, stderr) = Test.communicate ()
24 logging.info ('%s' % stdout)
25 logging.info ('%s' % stderr)
26 self.assertEqual(Test.returncode, 0)32 self.assertEqual(Test.returncode, 0)
2733
28if __name__ == '__main__':34if __name__ == '__main__':
2935
=== 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 @@
2020
21{% extends "base" %}21{% extends "base" %}
2222
23{% block tasksel_first %}
24tasksel tasksel/skip-tasks string standard
25{% endblock %}
26
23{% block kernel_flavor %}27{% block kernel_flavor %}
24d-i base-installer/kernel/override-image string linux-virtual28d-i base-installer/kernel/override-image string linux-virtual
25{% endblock %}29{% endblock %}
@@ -30,6 +34,7 @@
30{% endblock %}34{% endblock %}
3135
32{% block d_i_answers %}36{% block d_i_answers %}
37d-i base-installer/kernel/headers boolean false
33postfix postfix/mailname string {{ hostname }}38postfix postfix/mailname string {{ hostname }}
34postfix postfix/tlsmgr_upgrade_warning boolean39postfix postfix/tlsmgr_upgrade_warning boolean
35postfix postfix/recipient_delim string +40postfix postfix/recipient_delim string +
@@ -54,3 +59,4 @@
54{% block additional_repositories %}59{% block additional_repositories %}
55d-i apt-setup/proposed boolean true60d-i apt-setup/proposed boolean true
56{% endblock %}61{% endblock %}
62
5763
=== 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 @@
8logging.basicConfig(level=logging.DEBUG)8logging.basicConfig(level=logging.DEBUG)
99
10class ltpTest(unittest.TestCase):10class ltpTest(unittest.TestCase):
11 11
12 def testLTPlite(self):12 def runcmd(self, cmdargs):
13 logging.debug ('running %s' % cmdargs)
14 Test = subprocess.Popen (cmdargs,
15 stdout=subprocess.PIPE,
16 stderr=subprocess.PIPE)
17 (stdout, stderr) = Test.communicate ()
18 logging.info ('%s' % stdout)
19 logging.info ('%s' % stderr)
20 return Test
21
22 def setUp(self):
23 self.runcmd(['apt-get', 'update'])
24 self.runcmd(['apt-get', 'dist-upgrade','-y'])
25 self.runcmd(['apt-get', 'install', 'ltp', '-y'])
13 # hack: at least for ltp-lite:26 # hack: at least for ltp-lite:
14 os.makedirs ('/usr/lib/ltp/results/')27 os.makedirs ('/usr/lib/ltp/results/')
15 os.makedirs ('/usr/lib/ltp/tools/pan')28 os.makedirs ('/usr/lib/ltp/tools/pan')
16 os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')29 os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
17 # end hack30 # end hack
18 logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')31
19 Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',32 def testLTPlite(self):
20 '-f ltplite'],33 Test = self.runcmd(['/usr/lib/ltp/tools/runltp', '-f ltplite'])
21 stdout=subprocess.PIPE,
22 stderr=subprocess.PIPE)
23 (stdout, stderr) = Test.communicate ()
24 logging.info ('%s' % stdout)
25 logging.info ('%s' % stderr)
26 self.assertEqual(Test.returncode, 0)34 self.assertEqual(Test.returncode, 0)
2735
28if __name__ == '__main__':36if __name__ == '__main__':
2937
=== 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 @@
8logging.basicConfig(level=logging.DEBUG)8logging.basicConfig(level=logging.DEBUG)
99
10class ltpTest(unittest.TestCase):10class ltpTest(unittest.TestCase):
11 11
12 def testLTPlite(self):12 def runcmd(self, cmdargs):
13 logging.debug ('running %s' % cmdargs)
14 Test = subprocess.Popen (cmdargs,
15 stdout=subprocess.PIPE,
16 stderr=subprocess.PIPE)
17 (stdout, stderr) = Test.communicate ()
18 logging.info ('%s' % stdout)
19 logging.info ('%s' % stderr)
20 return Test
21
22 def setUp(self):
23 self.runcmd(['apt-get', 'install', 'ltp', '-y'])
13 # hack: at least for ltp-lite:24 # hack: at least for ltp-lite:
14 os.makedirs ('/usr/lib/ltp/results/')25 os.makedirs ('/usr/lib/ltp/results/')
15 os.makedirs ('/usr/lib/ltp/tools/pan')26 os.makedirs ('/usr/lib/ltp/tools/pan')
16 os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')27 os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
17 # end hack28 # end hack
18 logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')29
19 Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',30 def testLTPlite(self):
20 '-f ltplite'],31 Test = self.runcmd(['/usr/lib/ltp/tools/runltp', '-f ltplite'])
21 stdout=subprocess.PIPE,
22 stderr=subprocess.PIPE)
23 (stdout, stderr) = Test.communicate ()
24 logging.info ('%s' % stdout)
25 logging.info ('%s' % stderr)
26 self.assertEqual(Test.returncode, 0)32 self.assertEqual(Test.returncode, 0)
2733
28if __name__ == '__main__':34if __name__ == '__main__':

Subscribers

People subscribed via source and target branches