Merge lp:~rick-timmis/testdrive/testdrive into lp:testdrive

Proposed by Rick Timmis
Status: Needs review
Proposed branch: lp:~rick-timmis/testdrive/testdrive
Merge into: lp:testdrive
Diff against target: 681 lines (+135/-122)
5 files modified
.bzrignore (+2/-0)
po/testdrive.pot (+114/-106)
testdrive/virt/virtualbox.py (+14/-13)
testdrivegtk/AboutTestdrivegtkDialog.py (+1/-1)
testdriverc (+4/-2)
To merge this branch: bzr merge lp:~rick-timmis/testdrive/testdrive
Reviewer Review Type Date Requested Status
testdrive Pending
Review via email: mp+381346@code.launchpad.net

Commit message

Fix support for Virtual Box 5.x and 6.x

Provides support for Virtual Box 5.0, 5.1, 5.2 and 6.0, 6.1
Also amends DISK_SIZE Default from 8G to 12G as most Ubuntu distros seem to require just over 8G, which causes and Error by the Distro Installer

Description of the change

Implements support for Virtual Box 5.x and 6.x

Increases Default DISK_SIZE from 8G to 12G to stop distro installer throwing an error over disk size being too small

To post a comment you must log in.

Unmerged revisions

459. By Rick Timmis <email address hidden>

Fix support for Version 5.x and 6.x VirtualBox

Enables support for VirtualBox 5.0, 5.1, 5.2, 6.0, 6.1
Updates Default DISK_SIZE to 12G as most Ubuntu Distros require 8G

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '.bzrignore'
2--- .bzrignore 1970-01-01 00:00:00 +0000
3+++ .bzrignore 2020-03-28 19:39:52 +0000
4@@ -0,0 +1,2 @@
5+.idea
6+build
7
8=== modified file 'po/testdrive.pot'
9--- po/testdrive.pot 2013-08-10 21:31:38 +0000
10+++ po/testdrive.pot 2020-03-28 19:39:52 +0000
11@@ -8,7 +8,7 @@
12 msgstr ""
13 "Project-Id-Version: PACKAGE VERSION\n"
14 "Report-Msgid-Bugs-To: \n"
15-"POT-Creation-Date: 2013-08-11 07:31+1000\n"
16+"POT-Creation-Date: 2020-03-28 18:05+0000\n"
17 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
18 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
19 "Language-Team: LANGUAGE <LL@li.org>\n"
20@@ -29,43 +29,43 @@
21 msgid "ISO;Testing;Ubuntu;Daily;VM;Virtual Machine;zsync;rsync;Testdrive"
22 msgstr ""
23
24-#: ../bin/testdrive-gtk.py:49
25+#: ../bin/testdrive-gtk.py:55
26 msgid "Other"
27 msgstr ""
28
29 #. ##################################################################
30 #. ####### Obtaining the settings from the Preferences Class ########
31 #. ##################################################################
32-#: ../bin/testdrive-gtk.py:139
33+#: ../bin/testdrive-gtk.py:145
34 msgid "Instancing Preferences..."
35 msgstr ""
36
37-#: ../bin/testdrive-gtk.py:222
38+#: ../bin/testdrive-gtk.py:228
39 #, python-format
40 msgid ""
41 "Checking available ISOs at the ISO tracker [http://iso.qa.ubuntu.com] every "
42 "%s seconds"
43 msgstr ""
44
45-#: ../bin/testdrive-gtk.py:227
46+#: ../bin/testdrive-gtk.py:233
47 msgid "Unable to check the ISO tracker"
48 msgstr ""
49
50-#: ../bin/testdrive-gtk.py:265
51+#: ../bin/testdrive-gtk.py:271
52 #, python-format
53 msgid "<b>Release:</b> %s"
54 msgstr ""
55
56-#: ../bin/testdrive-gtk.py:266
57+#: ../bin/testdrive-gtk.py:272
58 #, python-format
59 msgid "<b>ISO Repository:</b> http://%s.ubuntu.com/"
60 msgstr ""
61
62-#: ../bin/testdrive-gtk.py:306
63+#: ../bin/testdrive-gtk.py:312
64 msgid "Add an ISO to TestDrive"
65 msgstr ""
66
67-#: ../bin/testdrive-gtk.py:322
68+#: ../bin/testdrive-gtk.py:328
69 msgid ""
70 "Unable to open because 'testdrive' is not installed.\n"
71 "Please install testdrive: \n"
72@@ -73,18 +73,18 @@
73 "sudo apt-get install testdrive-cli"
74 msgstr ""
75
76-#: ../bin/testdrive-gtk.py:326
77+#: ../bin/testdrive-gtk.py:332
78 msgid "TestDrive an ISO or Disk Image"
79 msgstr ""
80
81 #. ##################################################################
82 #. ## Obtains the command for the Sync process based on Protocol ####
83 #. ##################################################################
84-#: ../bin/testdrive-gtk.py:401
85+#: ../bin/testdrive-gtk.py:407
86 msgid "Obtaining the sync protocol for the specified ISO..."
87 msgstr ""
88
89-#: ../bin/testdrive-gtk.py:404 ../bin/testdrive.py:375
90+#: ../bin/testdrive-gtk.py:410 ../bin/testdrive.py:379
91 #, python-format
92 msgid "Unsupported protocol [%s]"
93 msgstr ""
94@@ -93,28 +93,28 @@
95 #. #### Obtains the Virtualization Method, if not shows warnings ####
96 #. ##################################################################
97 #. Choose the virtualization engine
98-#: ../bin/testdrive-gtk.py:415
99+#: ../bin/testdrive-gtk.py:421
100 msgid "Obtaining the virtualization method..."
101 msgstr ""
102
103-#: ../bin/testdrive-gtk.py:419
104+#: ../bin/testdrive-gtk.py:425
105 msgid "Your CPU supports KVM acceleration; please install KVM"
106 msgstr ""
107
108-#: ../bin/testdrive-gtk.py:420
109+#: ../bin/testdrive-gtk.py:426
110 msgid ""
111 "Your CPU supports KVM acceleration; please install KVM:\n"
112 "\n"
113 "sudo apt-get install qemu-kvm"
114 msgstr ""
115
116-#: ../bin/testdrive-gtk.py:424
117+#: ../bin/testdrive-gtk.py:430
118 msgid ""
119 "Your CPU does not support acceleration; run kvm-ok for more information; "
120 "then install VBox"
121 msgstr ""
122
123-#: ../bin/testdrive-gtk.py:425
124+#: ../bin/testdrive-gtk.py:431
125 msgid ""
126 "Your CPU does not support acceleration; run kvm-ok for more information;\n"
127 "then please install VirtualBox\n"
128@@ -127,119 +127,138 @@
129 #. ### Obtains the list of ISO available from the iso list cache ####
130 #. ##################################################################
131 #. Try to retrieve the ISO list from the cache
132-#: ../bin/testdrive-gtk.py:438 ../bin/testdrive.py:348
133+#: ../bin/testdrive-gtk.py:444 ../bin/testdrive.py:352
134 msgid "Retrieving the Ubuntu ISO list from cache..."
135 msgstr ""
136
137-#: ../bin/testdrive-gtk.py:442 ../bin/testdrive-gtk.py:443
138-#: ../bin/testdrive.py:352
139+#: ../bin/testdrive-gtk.py:448 ../bin/testdrive-gtk.py:449
140+#: ../bin/testdrive.py:356
141 msgid "Unable to retrieve the Ubuntu ISO list from cache..."
142 msgstr ""
143
144-#: ../bin/testdrive-gtk.py:563 ../bin/testdrive-gtk.py:598
145-#: ../bin/testdrive-gtk.py:905
146+#: ../bin/testdrive-gtk.py:569 ../bin/testdrive-gtk.py:604
147+#: ../bin/testdrive-gtk.py:919
148 #, python-format
149 msgid "<i> CACHE: [%s]</i>"
150 msgstr ""
151
152-#: ../bin/testdrive-gtk.py:565 ../bin/testdrive-gtk.py:600
153-#: ../bin/testdrive-gtk.py:907
154+#: ../bin/testdrive-gtk.py:571 ../bin/testdrive-gtk.py:606
155+#: ../bin/testdrive-gtk.py:921
156 msgid "<i> CACHE: [empty]</i>"
157 msgstr ""
158
159-#: ../bin/testdrive-gtk.py:628
160+#: ../bin/testdrive-gtk.py:634
161 msgid "<b><i>There are no Other ISOs yet...</i></b>"
162 msgstr ""
163
164-#: ../bin/testdrive-gtk.py:631
165+#: ../bin/testdrive-gtk.py:637
166 msgid "<b><i>There are no ISOs for this architecture yet...</i></b>"
167 msgstr ""
168
169 #. Add Button
170-#: ../bin/testdrive-gtk.py:665
171+#: ../bin/testdrive-gtk.py:671
172 msgid "Add ISO"
173 msgstr ""
174
175 #. Create Buttons
176-#: ../bin/testdrive-gtk.py:672
177+#: ../bin/testdrive-gtk.py:678
178 msgid "Create USB Disk"
179 msgstr ""
180
181-#: ../bin/testdrive-gtk.py:677
182+#: ../bin/testdrive-gtk.py:683
183 msgid "Sync"
184 msgstr ""
185
186-#: ../bin/testdrive-gtk.py:682
187+#: ../bin/testdrive-gtk.py:688
188 msgid "Launch"
189 msgstr ""
190
191-#: ../bin/testdrive-gtk.py:736 ../bin/testdrive.py:264
192+#: ../bin/testdrive-gtk.py:742 ../bin/testdrive.py:268
193 msgid "Using KVM for virtual machine hosting..."
194 msgstr ""
195
196-#: ../bin/testdrive-gtk.py:739 ../bin/testdrive.py:266
197+#: ../bin/testdrive-gtk.py:745 ../bin/testdrive.py:270
198 msgid "Using VirtualBox for virtual machine hosting..."
199 msgstr ""
200
201-#: ../bin/testdrive-gtk.py:742 ../bin/testdrive.py:268
202+#: ../bin/testdrive-gtk.py:748 ../bin/testdrive.py:272
203 msgid "Using Parallels Desktop for virtual machine hosting..."
204 msgstr ""
205
206-#: ../bin/testdrive-gtk.py:796
207+#: ../bin/testdrive-gtk.py:801
208 msgid "sync_iso: Thread is executing..."
209 msgstr ""
210
211-#: ../bin/testdrive-gtk.py:817
212+#: ../bin/testdrive-gtk.py:822
213 msgid "launch_iso: Thread is executing or syncing..."
214 msgstr ""
215
216-#: ../bin/testdrive-gtk.py:824
217+#: ../bin/testdrive-gtk.py:829
218 msgid ""
219 "No ISO has been selected.\n"
220 "\n"
221 "Please select an ISO to create an USB Startup Disk."
222 msgstr ""
223
224-#: ../bin/testdrive-gtk.py:829
225+#: ../bin/testdrive-gtk.py:834
226 msgid ""
227 "More than 1 ISO has been selected.\n"
228 "\n"
229 "Please select only 1 ISO to continue!"
230 msgstr ""
231
232-#: ../bin/testdrive-gtk.py:834
233+#: ../bin/testdrive-gtk.py:839
234 msgid ""
235 "The specified ISO does not exist!\n"
236 "\n"
237 "Please, synchronize the ISO to continue."
238 msgstr ""
239
240-#: ../bin/testdrive-gtk.py:841
241+#: ../bin/testdrive-gtk.py:846
242 msgid "Unable to launch USB Creator!"
243 msgstr ""
244
245-#: ../bin/testdrive-gtk.py:867
246+#: ../bin/testdrive-gtk.py:873
247 #, python-format
248 msgid " Downloading %s (0%%)"
249 msgstr ""
250
251-#: ../bin/testdrive-gtk.py:887
252+#: ../bin/testdrive-gtk.py:893
253 #, python-format
254 msgid " Downloading %s (%s%%)"
255 msgstr ""
256
257-#: ../bin/testdrive-gtk.py:936
258+#: ../bin/testdrive-gtk.py:896
259+#, python-format
260+msgid " Error downloading [%s]"
261+msgstr ""
262+
263+#: ../bin/testdrive-gtk.py:946
264+#, python-format
265+msgid "Error preparing virtualization: %s"
266+msgstr ""
267+
268+#: ../bin/testdrive-gtk.py:952
269 msgid " Configuring Virtual Machine..."
270 msgstr ""
271
272-#: ../bin/testdrive-gtk.py:942
273+#: ../bin/testdrive-gtk.py:960
274 msgid " Running Virtual Machine..."
275 msgstr ""
276
277-#: ../bin/testdrive-gtk.py:991
278+#: ../bin/testdrive-gtk.py:1024
279 msgid "Show debug messages"
280 msgstr ""
281
282+#: ../bin/testdrive-gtk.py:1028 ../bin/testdrive.py:202
283+msgid "print version and system data, and exit"
284+msgstr ""
285+
286+#: ../bin/testdrive-gtk.py:1033
287+#, python-format
288+msgid "testdrive-gtk %s"
289+msgstr ""
290+
291 #: ../bin/testdrive.py:52
292 msgid ""
293 "\n"
294@@ -268,115 +287,104 @@
295 "ERROR: Invalid input\n"
296 msgstr ""
297
298-#: ../bin/testdrive.py:77
299+#: ../bin/testdrive.py:78
300 msgid ""
301 "\n"
302 "Enter an ISO URL to testdrive: "
303 msgstr ""
304
305-#: ../bin/testdrive.py:84
306+#: ../bin/testdrive.py:88
307 msgid ""
308 "\n"
309 "ERROR: Invalid selection\n"
310 msgstr ""
311
312-#: ../bin/testdrive.py:88
313-#, python-format
314-msgid ""
315-"\n"
316-"%s\n"
317-msgstr ""
318-
319-#: ../bin/testdrive.py:102 ../testdrivegtk/AddOtherTestdrivegtkDialog.py:155
320+#: ../bin/testdrive.py:106 ../testdrivegtk/AddOtherTestdrivegtkDialog.py:155
321 #, python-format
322 msgid "Invalid ISO URL [%s]"
323 msgstr ""
324
325-#: ../bin/testdrive.py:144
326+#: ../bin/testdrive.py:148
327 #, python-format
328 msgid ""
329 "Command failed\n"
330 " `%s`"
331 msgstr ""
332
333-#: ../bin/testdrive.py:151
334+#: ../bin/testdrive.py:155
335 msgid "Launching Virtual Machine using CURSES as screen mode"
336 msgstr ""
337
338-#: ../bin/testdrive.py:196
339+#: ../bin/testdrive.py:200
340 msgid "user configuration file (overriding default values"
341 msgstr ""
342
343-#: ../bin/testdrive.py:198
344-msgid "print version and system data, and exit"
345-msgstr ""
346-
347-#: ../bin/testdrive.py:200
348+#: ../bin/testdrive.py:204
349 msgid "get ISO image from this URL location"
350 msgstr ""
351
352-#: ../bin/testdrive.py:202
353+#: ../bin/testdrive.py:206
354 msgid "try to launch usb-creator for further testing"
355 msgstr ""
356
357-#: ../bin/testdrive.py:204
358+#: ../bin/testdrive.py:208
359 msgid "hardcode Ubuntu RELEASE codename"
360 msgstr ""
361
362-#: ../bin/testdrive.py:206
363+#: ../bin/testdrive.py:210
364 msgid ""
365 "hardcode Ubuntu flavor. Available Flavors:\n"
366 " ubuntu/kubuntu/xubuntu/edubuntu/mythbuntu/ubuntustudio/lubuntu/"
367-"ubuntukylin"
368+"ubuntukylin/ubuntugnome"
369 msgstr ""
370
371-#: ../bin/testdrive.py:209
372+#: ../bin/testdrive.py:213
373 msgid ""
374 "hardcode Ubuntu repository from where to obtain ISOs:\n"
375 " releases/cdimage/cloud-daily/cloud-releases"
376 msgstr ""
377
378-#: ../bin/testdrive.py:212
379+#: ../bin/testdrive.py:216
380 msgid "displays the Virtual Machine in the shell. Only valid for Cloud images."
381 msgstr ""
382
383-#: ../bin/testdrive.py:217
384+#: ../bin/testdrive.py:221
385 #, python-format
386 msgid "version passed: %s"
387 msgstr ""
388
389-#: ../bin/testdrive.py:221
390+#: ../bin/testdrive.py:225
391 #, python-format
392 msgid "testdrive %s"
393 msgstr ""
394
395-#: ../bin/testdrive.py:233
396+#: ../bin/testdrive.py:237
397 #, python-format
398 msgid "config passed: %s"
399 msgstr ""
400
401-#: ../bin/testdrive.py:243
402+#: ../bin/testdrive.py:247
403 #, python-format
404 msgid "Trying config in %s"
405 msgstr ""
406
407-#: ../bin/testdrive.py:247
408+#: ../bin/testdrive.py:251
409 #, python-format
410 msgid "Using configuration in %s"
411 msgstr ""
412
413-#: ../bin/testdrive.py:249
414+#: ../bin/testdrive.py:253
415 #, python-format
416 msgid "Invalid configuration [%s]"
417 msgstr ""
418
419-#: ../bin/testdrive.py:257
420+#: ../bin/testdrive.py:261
421 msgid ""
422 "Your CPU supports KVM acceleration; please install KVM:\n"
423 " sudo apt-get install qemu-kvm"
424 msgstr ""
425
426-#: ../bin/testdrive.py:260
427+#: ../bin/testdrive.py:264
428 msgid ""
429 "Your CPU does not support acceleration; run kvm-ok for more information; "
430 "then please install VirtualBox:\n"
431@@ -384,35 +392,33 @@
432 " sudo apt-get install virtualbox"
433 msgstr ""
434
435-#: ../bin/testdrive.py:284
436+#: ../bin/testdrive.py:288
437 msgid ""
438 "Launching Cloud images only works with KVM. Please switch your "
439 "virtualization method..."
440 msgstr ""
441
442-#: ../bin/testdrive.py:335
443-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:339
444+#: ../bin/testdrive.py:339 ../testdrivegtk/PreferencesTestdrivegtkDialog.py:351
445 #, python-format
446 msgid "Obtaining Ubuntu ISO list from %s..."
447 msgstr ""
448
449-#: ../bin/testdrive.py:339
450+#: ../bin/testdrive.py:343
451 #, python-format
452 msgid "ERROR: Could not obtain the Ubuntu ISO list from %s..."
453 msgstr ""
454
455-#: ../bin/testdrive.py:345
456-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:351
457+#: ../bin/testdrive.py:349 ../testdrivegtk/PreferencesTestdrivegtkDialog.py:363
458 msgid "Unable to update the Ubuntu ISO list cache..."
459 msgstr ""
460
461 #. BUG: should check disk space availability in CACHE dir
462 #. Update the cache
463-#: ../bin/testdrive.py:371
464+#: ../bin/testdrive.py:375
465 msgid "Syncing the specified ISO..."
466 msgstr ""
467
468-#: ../bin/testdrive.py:378 ../testdrivegtk/AddOtherTestdrivegtkDialog.py:167
469+#: ../bin/testdrive.py:382 ../testdrivegtk/AddOtherTestdrivegtkDialog.py:167
470 #, python-format
471 msgid "ISO not found at [%s]"
472 msgstr ""
473@@ -420,53 +426,55 @@
474 #. ##################
475 #. # Launch the VM ##
476 #. ##################
477-#: ../bin/testdrive.py:401
478+#: ../bin/testdrive.py:405
479 msgid "Validating Virtualization Method...."
480 msgstr ""
481
482-#: ../bin/testdrive.py:405
483+#: ../bin/testdrive.py:409
484 #, python-format
485-msgid "Unable to validate Virtualization Method [%s]"
486+msgid "Unable to validate Virtualization Method [%s] (%s)"
487 msgstr ""
488
489-#: ../bin/testdrive.py:407
490+#: ../bin/testdrive.py:412
491 msgid "Setting up Virtual Machine..."
492 msgstr ""
493
494-#: ../bin/testdrive.py:411
495-msgid "Unable to setup Virtual Machine"
496+#: ../bin/testdrive.py:416
497+#, python-format
498+msgid "Unable to setup Virtual Machine (%s)"
499 msgstr ""
500
501-#: ../bin/testdrive.py:413
502+#: ../bin/testdrive.py:418
503 msgid "Launching Virtual Machine..."
504 msgstr ""
505
506-#: ../bin/testdrive.py:421
507-msgid "Unable to launch Virtual Machine"
508+#: ../bin/testdrive.py:426
509+#, python-format
510+msgid "Unable to launch Virtual Machine (%s)"
511 msgstr ""
512
513-#: ../bin/testdrive.py:425
514+#: ../bin/testdrive.py:430
515 #, python-format
516 msgid "Cleaning up disk image [%s]..."
517 msgstr ""
518
519 #. Remind about cache cleanup
520-#: ../bin/testdrive.py:428
521+#: ../bin/testdrive.py:433
522 msgid "You may wish to clean up the cache directory..."
523 msgstr ""
524
525-#: ../bin/testdrive.py:429
526+#: ../bin/testdrive.py:434
527 #, python-format
528 msgid " %s and %s"
529 msgstr ""
530
531-#: ../bin/testdrive.py:436
532+#: ../bin/testdrive.py:441
533 msgid ""
534 "\n"
535 "Launch USB Startup Disk Creator for further testing of this ISO? [y/N] "
536 msgstr ""
537
538-#: ../bin/testdrive.py:440
539+#: ../bin/testdrive.py:445
540 msgid ""
541 "\n"
542 "Press <enter> to exit..."
543@@ -510,41 +518,41 @@
544 msgstr ""
545
546 #: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:149
547-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:496
548+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:514
549 msgid "Select Release:"
550 msgstr ""
551
552 #. Load config files for local variables
553 #. self.load_config_files(file)
554-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:217
555+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:223
556 #, python-format
557 msgid "Reading config file: [%s]"
558 msgstr ""
559
560-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:219
561+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:225
562 #, python-format
563 msgid "Unable to load config file [%s]"
564 msgstr ""
565
566-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:282
567+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:288
568 #, python-format
569 msgid " of %s available."
570 msgstr ""
571
572-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:343
573+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:355
574 #, python-format
575 msgid "Could not obtain the Ubuntu ISO list from %s..."
576 msgstr ""
577
578-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:347
579+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:359
580 msgid "Updating the Ubuntu ISO list cache..."
581 msgstr ""
582
583-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:355
584+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:367
585 msgid "get_preferences()"
586 msgstr ""
587
588-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:478
589+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:496
590 #, python-format
591 msgid "Unable to clean up files from [%s]"
592 msgstr ""
593
594=== modified file 'testdrive/virt/virtualbox.py'
595--- testdrive/virt/virtualbox.py 2014-09-13 13:04:27 +0000
596+++ testdrive/virt/virtualbox.py 2020-03-28 19:39:52 +0000
597@@ -62,15 +62,15 @@
598 def validate_virt(self):
599 # Determine which version of VirtualBox we have installed. What is returned is
600 # typically a string such as '4.1.0r55467', lets assume that the command line
601- # is consistent within 4.x.x versions extract this part of the
602- # version string for comparison later
603- self.vboxversion = self.get_vboxversion()
604- supported_versions = ((4,0), (4,1), (4,2), (4,3))
605+ # is consistent within 4.x.x, 5.x.x or 6.x.x versions extract this part of the
606+ # version string for comparison later.
607+ # VirtualBox versions available from Oracle ( https://www.virtualbox.org/wiki/Download_Old_Builds )
608+ self.get_vboxversion()
609+ supported_versions = ((4,0), (4,1), (4,2), (4,3), (5,0), (5,1), (5,2), (6,0), (6,1))
610 if self.vboxversion in supported_versions:
611 logger.info("VirtualBox %s.%s detected." % self.vboxversion)
612 else:
613- err_text = ("Unsupported version (%s.%s) of VirtualBox; "
614- "please install v4.0 or newer.") % self.vboxversion
615+ err_text = ("Unsupported version (%s.%s) of VirtualBox; please install v4.0 or newer.") % self.vboxversion
616 raise VirtException(err_text)
617
618 # Code to setup virtual machine
619@@ -108,16 +108,17 @@
620 # Code launch virtual machine
621 def launch_virt(self):
622 logger.info("Running the Virtual Machine...")
623- if self.vboxversion == (4,0) or self.vboxversion == (4,1) or self.vboxversion == (4,2) or self.vboxversion == (4,3):
624- self.run_or_die("VBoxManage storagectl %s --name \"IDE Controller\" --add ide" % self.VBOX_NAME)
625- self.run_or_die("VBoxManage storageattach %s --storagectl \"IDE Controller\" --port 0 --device 0 --type hdd --medium %s" % (self.VBOX_NAME, self.DISK_FILE))
626- if self.PATH_TO_ISO != "/dev/null":
627- self.run_or_die("VBoxManage storageattach %s --storagectl \"IDE Controller\" --port 0 --device 1 --type dvddrive --medium %s" % (self.VBOX_NAME, self.PATH_TO_ISO))
628+ # Deprecating this version test, as we already checked version in validate_virt() above - FIXME Remove in future version
629+ #if self.vboxversion == (4,0) or self.vboxversion == (4,1) or self.vboxversion == (4,2) or self.vboxversion == (4,3):
630+ self.run_or_die("VBoxManage storagectl %s --name \"IDE Controller\" --add ide" % self.VBOX_NAME)
631+ self.run_or_die("VBoxManage storageattach %s --storagectl \"IDE Controller\" --port 0 --device 0 --type hdd --medium %s" % (self.VBOX_NAME, self.DISK_FILE))
632+ if self.PATH_TO_ISO != "/dev/null":
633+ self.run_or_die("VBoxManage storageattach %s --storagectl \"IDE Controller\" --port 0 --device 1 --type dvddrive --medium %s" % (self.VBOX_NAME, self.PATH_TO_ISO))
634 #self.run_or_die("VBoxManage startvm %s" % self.td.VBOX_NAME)
635- return "VBoxManage startvm %s" % self.VBOX_NAME
636+ return "VBoxManage startvm %s" % self.VBOX_NAME
637
638 # Give this VM a few seconds to start up
639 #time.sleep(5)
640 # Loop as long as this VM is running
641 #while commands.getstatusoutput("VBoxManage list runningvms | grep -qs %s" % self.td.VBOX_NAME)[0] == 0:
642- # time.sleep(2)
643+ # time.sleep(2)bzr
644
645=== modified file 'testdrivegtk/AboutTestdrivegtkDialog.py'
646--- testdrivegtk/AboutTestdrivegtkDialog.py 2012-05-15 20:43:24 +0000
647+++ testdrivegtk/AboutTestdrivegtkDialog.py 2020-03-28 19:39:52 +0000
648@@ -28,8 +28,8 @@
649
650 import commands
651 version = commands.getstatusoutput("dpkg -l testdrive-gtk | tail -n1 | awk '{print $3}'")
652-
653 __version__ = version[1].split("-0")[0]
654+
655 __licensenotice__ = 'This program is free software: you can redistribute it and/or modify\n\
656 it under the terms of the GNU General Public License as published by\n\
657 the Free Software Foundation, either version 3 of the License, or\n\
658
659=== modified file 'testdriverc'
660--- testdriverc 2015-07-28 19:04:53 +0000
661+++ testdriverc 2020-03-28 19:39:52 +0000
662@@ -1,3 +1,4 @@
663+
664 # This is the global configuration file for the testdrive(1) utility.
665 [testdrive-common]
666
667@@ -41,11 +42,12 @@
668 # DISK_SIZE is the size of the disk image
669 # Note that this will be a sparse, qcow2 file, so it should not actually
670 # take that much space on the filesystem.
671-# Default: 8G
672+# Default: 12G
673 #DISK_Size = 4G
674 #DISK_SIZE = 6G
675-DISK_SIZE = 8G
676+#DISK_SIZE = 8G
677 #DISK_SIZE = 10G
678+DISK_SIZE = 12G
679 #Disk_SIZE = 16G
680
681 # KVM_ARGS is a string of arbitrary KVM_ARGS to use when launching the VM

Subscribers

People subscribed via source and target branches