[SCM] debian-live/autotesting branch, master, updated. 0f2c10b25ec338b4299bebdca055e9eeb8a87614
Brendan M. Sleight (none)
bms at brum.
Sun Feb 28 22:57:03 UTC 2010
The following commit has been merged in the master branch:
commit 0f2c10b25ec338b4299bebdca055e9eeb8a87614
Author: Brendan M. Sleight <bms at brum.(none)>
Date: Sun Feb 28 22:56:54 2010 +0000
Updating to look at debian-live-503. Adding option for unusual daily download urls.
diff --git a/autotesting.py b/autotesting.py
index ae97bf4..c9bc8f7 100644
--- a/autotesting.py
+++ b/autotesting.py
@@ -19,7 +19,7 @@
from optparse import OptionParser
-import amara, datetime, os, shutil, subprocess, sys, telnetlib, tempfile, time
+import amara, datetime, os, shutil, subprocess, sys, telnetlib, tempfile, time, datetime
def displayNumber():
"""Really a global we can change later to something better.
@@ -76,13 +76,20 @@ def wget(url):
retcode = subprocess.call(L)
return tmpFile
-def getDownloads(downloadURL, backgroundURL):
- """ Create two temp files and download the main downlaod and
+def getDownloads(download, backgroundURL):
+ """ Create two temp files and download the main download and
the background
return tempfile, tempfile"""
background = wget(str(backgroundURL))
+ try:
+ # datetime.timedelta(days=55)
+ daysOfset = int(str(download.daysofset))
+ dateUrlPart = datetime.datetime.now() - datetime.timedelta(days=daysOfset)
+ downloadURL=str(download.url) + dateUrlPart.strftime(str(download.dateformat)) + str(download.dateformatend)
+ except:
+ downloadURL=str(download.url)
download = wget(str(downloadURL))
- return download, background
+ return download, downloadURL, background
def authorityFile():
""" Return a file containing "localhost"
@@ -132,13 +139,14 @@ def xmessage(display, title, message, time, font):
"-center", "\n" + message]
retcode = subprocess.call(xloadimage)
-def openingTitles(display, test):
+def openingTitles(display, test, downloadURL):
log("Showing Opening Titles")
time.sleep(2)
xmessage(display, str(test.title), "Autotesting of: " + str(test.title), "3", "monospace 14")
xmessage(display, str(test.title), str(test.description), "3", "monospace 6")
xmessage(display, str(test.title), "Created at " + str(datetime.datetime.now()), "2", "monospace 10")
-
+ xmessage(display, str(test.title), "Downloaded using this url: " + str(downloadURL), "2", "monospace 10")
+
def runningQemu(display, test, qemuDownload):
""" Start qemu running, with a local telnet port at 55555 listening acting as the qemu monitor
returns subprocess.process"""
@@ -270,10 +278,10 @@ def main():
for test in tests.test:
if cronCheak(str(test.frequency)):
log("Starting Autotesting of: " + str(test.title))
- (download, background) = getDownloads(str(test.download), str(test.background))
+ (download, downloadURL, background) = getDownloads(test.download, str(test.background))
xvfb = startXvfb(display, str(test.qemu.xscreen), background.name)
(recordMyDesktop, video) = startRecordMyDesktop(display)
- openingTitles(display, test)
+ openingTitles(display, test, downloadURL)
try:
qemu = runningQemu(display, test, download.name)
finalImage = captureScreenshot(display)
diff --git a/tests-source/debian-live-all.xml b/tests-source/debian-live-all.xml
index 0fb80ed..ecd1ed2 100644
--- a/tests-source/debian-live-all.xml
+++ b/tests-source/debian-live-all.xml
@@ -39,10 +39,10 @@
</packages>
</tests>
<root_url>http://cdimage.debian.org/cdimage/release/current-live/</root_url>
- <filename_start>debian-live-501</filename_start>
- <background>http://git.debian.org/?p=debian-live/homepage.git;a=blob_plain;f=images/debian-live.png</background>
- <title>Debian Live 5.01</title>
- <description>Debian Live. Daily build of 5.01, </description>
+ <filename_start>debian-live-503</filename_start>
+ <background>http://live.debian.net/gitweb?p=homepage.git;a=blob_plain;f=images/debian-live.png;hb=master</background>
+ <title>Debian Live 5.03</title>
+ <description>Debian Live. Daily build of 5.03, </description>
<frequency>monthly</frequency>
<qemu>
<xscreen>800x600x24</xscreen>
@@ -54,7 +54,7 @@
<output>
<keep>4</keep>
<root>/var/www/autotesting/</root>
- <local>debian-live/5.01/</local>
+ <local>debian-live/5.03/</local>
<!-- <local>debian-live/5.01/i386/gnome/</local> -->
<video>autotesting.ogv</video>
<screenshots>
diff --git a/tests-source/debian-live-i386-iso-xfce.xml b/tests-source/debian-live-i386-iso-xfce.xml
index 33cad94..e028d7a 100644
--- a/tests-source/debian-live-i386-iso-xfce.xml
+++ b/tests-source/debian-live-i386-iso-xfce.xml
@@ -25,10 +25,10 @@
</packages>
</tests>
<root_url>http://cdimage.debian.org/cdimage/release/current-live/</root_url>
- <filename_start>debian-live-501</filename_start>
- <background>http://git.debian.org/?p=debian-live/homepage.git;a=blob_plain;f=images/debian-live.png</background>
- <title>Debian Live 5.01</title>
- <description>Debian Live. Daily build of 5.01, </description>
+ <filename_start>debian-live-503</filename_start>
+ <background>http://live.debian.net/gitweb?p=homepage.git;a=blob_plain;f=images/debian-live.png;hb=master</background>
+ <title>Debian Live 5.03</title>
+ <description>Debian Live. Daily build of 5.03, </description>
<frequency>daily</frequency>
<qemu>
<xscreen>800x600x24</xscreen>
@@ -40,7 +40,7 @@
<output>
<keep>4</keep>
<root>/var/www/autotesting/</root>
- <local>debian-live/5.01/</local>
+ <local>debian-live/5.03/</local>
<!-- <local>debian-live/5.01/i386/gnome/</local> -->
<video>autotesting.ogv</video>
<screenshots>
diff --git a/tests-source/debian-live-i386-iso.xml b/tests-source/debian-live-i386-iso.xml
index 9322f38..547dae0 100644
--- a/tests-source/debian-live-i386-iso.xml
+++ b/tests-source/debian-live-i386-iso.xml
@@ -29,10 +29,10 @@
</packages>
</tests>
<root_url>http://cdimage.debian.org/cdimage/release/current-live/</root_url>
- <filename_start>debian-live-501</filename_start>
- <background>http://git.debian.org/?p=debian-live/homepage.git;a=blob_plain;f=images/debian-live.png</background>
- <title>Debian Live 5.01</title>
- <description>Debian Live. Daily build of 5.01, </description>
+ <filename_start>debian-live-503</filename_start>
+ <background>http://live.debian.net/gitweb?p=homepage.git;a=blob_plain;f=images/debian-live.png;hb=master</background>
+ <title>Debian Live 5.03</title>
+ <description>Debian Live. Daily build of 5.03, </description>
<frequency>monthly</frequency>
<qemu>
<xscreen>800x600x24</xscreen>
@@ -44,7 +44,7 @@
<output>
<keep>4</keep>
<root>/var/www/autotesting/</root>
- <local>debian-live/5.01/</local>
+ <local>debian-live/5.03/</local>
<!-- <local>debian-live/5.01/i386/gnome/</local> -->
<video>autotesting.ogv</video>
<screenshots>
diff --git a/tests-source/transform-to-test-list.xml b/tests-source/transform-to-test-list.xml
index 4dbbf57..b7e0b75 100644
--- a/tests-source/transform-to-test-list.xml
+++ b/tests-source/transform-to-test-list.xml
@@ -14,7 +14,7 @@
<xsl:for-each select="/autotesting/source/tests/packages/package">
<xsl:variable name="package" select="."/>
<test>
- <download><xsl:value-of select="//autotesting/source/root_url" /><xsl:value-of select="$processor_name"/>/<xsl:value-of select="$image_name"/>/<xsl:value-of select="//autotesting/source/filename_start" />-<xsl:value-of select="$processor_name"/>-<xsl:value-of select="$package"/><xsl:value-of select="$extension"/></download>
+ <download><url><xsl:value-of select="//autotesting/source/root_url" /><xsl:value-of select="$processor_name"/>/<xsl:value-of select="$image_name"/>/<xsl:value-of select="//autotesting/source/filename_start" />-<xsl:value-of select="$processor_name"/>-<xsl:value-of select="$package"/><xsl:value-of select="$extension"/></url></download>
<xsl:copy-of select="//autotesting/source/title" />
<description><xsl:value-of select="//autotesting/source/description" />
<xsl:value-of select="$processor_name"/>,  <xsl:value-of select="$image_name"/>,  <xsl:value-of select="."/>
diff --git a/tests/webconverger.xml b/tests/webconverger.xml
index 67c240b..b83987a 100644
--- a/tests/webconverger.xml
+++ b/tests/webconverger.xml
@@ -1,12 +1,12 @@
<autotesting>
<tests>
<test>
- <download>http://download.webconverger.com/webc-4.9.iso</download>
- <title>Webconverger (4.9)</title>
- <description>Webconverger (4.9)
+ <download>http://download.webconverger.com/webc-6.0.iso</download>
+ <title>Webconverger (6.0)</title>
+ <description>Webconverger (6.0)
Webconverger is a Live Web kiosk Linux distribution for public places.
It is designed to get you on the Web easily without compromising your privacy.
-(http://download.webconverger.com/webc-4.9.iso)
+(http://download.webconverger.com/webc-6.0.iso)
</description>
<background>http://webconverger.com/logos/flower600.png</background>
<frequency>daily</frequency>
@@ -23,7 +23,7 @@ It is designed to get you on the Web easily without compromising your privacy.
<!-- Number of test sets to keep -->
<keep>4</keep>
<root>/var/www/autotesting/</root>
- <local>webconverger/4.9/iso/</local>
+ <local>webconverger/6.0/iso/</local>
<video>autotesting.ogv</video>
<screenshots>
<final>final-screenshot.png</final>
@@ -32,12 +32,12 @@ It is designed to get you on the Web easily without compromising your privacy.
</output>
</test>
<test>
- <download>http://download.webconverger.com/webc-4.9.img</download>
- <title>Webconverger (4.9)</title>
- <description>Webconverger (4.9)
+ <download>http://download.webconverger.com/webc-6.0.img</download>
+ <title>Webconverger (6.0)</title>
+ <description>Webconverger (6.0)
Webconverger is a Live Web kiosk Linux distribution for public places.
It is designed to get you on the Web easily without compromising your privacy.
-(http://download.webconverger.com/webc-4.9.img)
+(http://download.webconverger.com/webc-6.0.img)
</description>
<background>http://webconverger.com/logos/flower600.png</background>
<frequency>daily</frequency>
@@ -53,7 +53,7 @@ It is designed to get you on the Web easily without compromising your privacy.
<output>
<keep>4</keep>
<root>/var/www/autotesting/</root>
- <local>webconverger/4.9/img/</local>
+ <local>webconverger/6.0/img/</local>
<video>autotesting.ogv</video>
<screenshots>
<final>final-screenshot.png</final>
--
debian-live/autotesting
More information about the debian-live-changes
mailing list