← Back to branch summary

~ubuntu-branches/ubuntu/wily/testdrive/wily-proposed

« back to all changes in this revision

Viewing changes to testdrive/testdrive.py

  • Committer: Package Import Robot
  • Author(s): Dustin Kirkland, Jackson Doak, Bryan Quigley
  • Date: 2014-02-03 15:35:26 UTC
  • Revision ID: package-import@ubuntu.com-20140203153526-ke3a48st1v38poaf
Tags: 3.27-0ubuntu1
[ Jackson Doak ]
* Bump default disk size to 8gb so we support ubuntu again

[ Bryan Quigley ]
* testdriverc, testdrive/testdrive.py:
  - add mouse cursor to kvm

Show diffs side-by-side

added added

removed removed

Lines of Context:
testdrive/testdrive.py
31
31
    "kubuntu-active":"kubuntu",
32
32
    "ubuntukylin":"ubuntukylin",
33
33
    "ubuntu-gnome":"ubuntugnome",
 
34
    "ubuntu-mate":"ubuntumate",
 
35
    "ubuntu-desktop-next":"ubuntudesktopnext",
34
36
}
35
37
 
36
38
 
44
46
    "ubuntu-server":"Ubuntu",
45
47
    "ubuntukylin":"UbuntuKylin",
46
48
    "ubuntu-gnome":"Ubuntu Gnome",
 
49
    "ubuntu-mate":"Ubuntu MATE",
 
50
    "ubuntu-desktop-next":"Ubuntu Desktop Next",
47
51
    "cloud-server":"Cloud Server",
48
52
    "cloud-desktop":"Cloud Desktop",
49
53
}
210
214
            self.SMP = commands.getoutput("grep -c ^processor /proc/cpuinfo")
211
215
 
212
216
        if len(self.DISK_SIZE) == 0:
213
 
            self.DISK_SIZE = "6G"
 
217
            self.DISK_SIZE = "8G"
214
218
 
215
219
        if len(self.MEM) == 0:
216
220
            total = commands.getoutput("grep ^MemTotal /proc/meminfo | awk '{print $2}'")
226
230
                self.MEM = "256"
227
231
 
228
232
        if len(self.KVM_ARGS) == 0:
229
 
            self.KVM_ARGS = "-usb -usbdevice tablet -net nic,model=virtio -net user -soundhw es1370"
 
233
            self.KVM_ARGS = "-usb -usbdevice mouse -usbdevice tablet -net nic,model=virtio -net user -soundhw es1370 -vga cirrus -show-cursor -enable-kvm"
230
234
 
231
235
        if len(self.VBOX_NAME) == 0:
232
236
            self.VBOX_NAME = self.PKG
260
264
 
261
265
    def get_proto(self):
262
266
        if self.PROTO == "rsync":
263
 
            cmd = "rsync -azPL %s %s" % (self.ISO_URL, self.PATH_TO_ISO)
 
267
            cmd = "rsync --contimeout=5 --timeout=10 -azPL %s %s" % (self.ISO_URL, self.PATH_TO_ISO)
264
268
            return cmd
265
269
        elif self.PROTO == "zsync" or self.PROTO == "http" or self.PROTO == "ftp":
266
270
            if commands.getstatusoutput("which zsync")[0] == 0: