Author: sandervanderburg
Date: Sat Dec 18 22:57:36 2010
New Revision: 25195
URL: https://svn.nixos.org/websvn/nix/?rev=25195&sc=1
Log:
- Added a check which verifies whether we have correct results
- Wait a little longer for Firefox
Modified:
disnix/examples/php-mysql/trunk/release.nix
Modified: disnix/examples/php-mysql/trunk/release.nix
==============================================================================
--- disnix/examples/php-mysql/trunk/release.nix Sat Dec 18 22:13:14 2010
(r25194)
+++ disnix/examples/php-mysql/trunk/release.nix Sat Dec 18 22:57:36 2010
(r25195)
@@ -43,10 +43,23 @@
networkFile = "deployment/DistributedDeployment/network.nix";
testScript =
''
- $test3->mustSucceed("sleep 10");
+ # Wait for a while and capture the output of the entry page
+ my $result = $test3->mustSucceed("sleep 30; curl --fail
http://test1/stafftracker/index.php";);
+
+ # The entry page should contain my name :-)
+
+ if ($result =~ /Sander/) {
+ print "Entry page contains Sander!\n";
+ }
+ else {
+ die "Entry page should contain Sander!\n";
+ }
+
+ # Start Firefox and take a screenshot
+
$test3->mustSucceed("firefox http://test1/stafftracker/index.php
&");
- $test3->mustSucceed("sleep 10");
-
+ $test3->waitForWindow(qr/Namoroka/);
+ $test3->mustSucceed("sleep 30");
$test3->screenshot("screen");
'';
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
