Author: sandervanderburg
Date: Sat Dec 18 23:42:41 2010
New Revision: 25196
URL: https://svn.nixos.org/websvn/nix/?rev=25196&sc=1
Log:
- In every testcase the result is checked
- Wait a little longer until Firefox is launched
Modified:
disnix/examples/HelloWorldExample/trunk/release-composition.nix
disnix/examples/HelloWorldExample/trunk/release-loadbalancing.nix
disnix/examples/HelloWorldExample/trunk/release-lookup.nix
disnix/examples/HelloWorldExample/trunk/release-simple.nix
Modified: disnix/examples/HelloWorldExample/trunk/release-composition.nix
==============================================================================
--- disnix/examples/HelloWorldExample/trunk/release-composition.nix Sat Dec
18 22:57:36 2010 (r25195)
+++ disnix/examples/HelloWorldExample/trunk/release-composition.nix Sat Dec
18 23:42:41 2010 (r25196)
@@ -42,12 +42,21 @@
networkFile = "deployment/DistributedDeployment/network.nix";
testScript =
''
- $test1->waitForFile("/var/tomcat/webapps/HelloWorld");
- $test1->mustSucceed("sleep 30; curl --fail
http://test1:8080/HelloWorld/index.jsp >&2");
-
+ $test1->waitForFile("/var/tomcat/webapps/HelloWorld");
+ my $result = $test1->mustSucceed("sleep 30; curl --fail
http://test1:8080/HelloWorld/index.jsp";);
+
+ # The entry page should contain Hello World
+
+ if ($result =~ /Hello world/) {
+ print "Entry page contains: Hello world!\n";
+ }
+ else {
+ die "Entry page should contain Hello world!\n";
+ }
+
$test3->mustSucceed("firefox http://test1:8080/HelloWorld &");
- $test3->mustSucceed("sleep 10");
-
+ $test3->waitForWindow(qr/Namoroka/);
+ $test3->mustSucceed("sleep 30");
$test3->screenshot("screen");
'';
};
Modified: disnix/examples/HelloWorldExample/trunk/release-loadbalancing.nix
==============================================================================
--- disnix/examples/HelloWorldExample/trunk/release-loadbalancing.nix Sat Dec
18 22:57:36 2010 (r25195)
+++ disnix/examples/HelloWorldExample/trunk/release-loadbalancing.nix Sat Dec
18 23:42:41 2010 (r25196)
@@ -43,10 +43,20 @@
testScript =
''
$test1->waitForFile("/var/tomcat/webapps/HelloWorld2");
- $test1->mustSucceed("sleep 30; curl --fail
http://test1:8080/HelloWorld2/index.jsp >&2");
+ my $result = $test1->mustSucceed("sleep 30; curl --fail
http://test1:8080/HelloWorld2/index.jsp";);
+
+ # The entry page should contain Hello World
+
+ if ($result =~ /Hello world/) {
+ print "Entry page contains: Hello world!\n";
+ }
+ else {
+ die "Entry page should contain Hello world!\n";
+ }
+
$test3->mustSucceed("firefox http://test1:8080/HelloWorld2 &");
- $test3->mustSucceed("sleep 15");
-
+ $test3->waitForWindow(qr/Namoroka/);
+ $test3->mustSucceed("sleep 30");
$test3->screenshot("screen");
'';
};
Modified: disnix/examples/HelloWorldExample/trunk/release-lookup.nix
==============================================================================
--- disnix/examples/HelloWorldExample/trunk/release-lookup.nix Sat Dec 18
22:57:36 2010 (r25195)
+++ disnix/examples/HelloWorldExample/trunk/release-lookup.nix Sat Dec 18
23:42:41 2010 (r25196)
@@ -43,10 +43,20 @@
testScript =
''
$test1->waitForFile("/var/tomcat/webapps/HelloWorld2");
- $test1->mustSucceed("sleep 30; curl --fail
http://test1:8080/HelloWorld2/index.jsp >&2");
+ my $result = $test1->mustSucceed("sleep 30; curl --fail
http://test1:8080/HelloWorld2/index.jsp";);
+
+ # The entry page should contain Hello World
+
+ if ($result =~ /Hello world/) {
+ print "Entry page contains: Hello world!\n";
+ }
+ else {
+ die "Entry page should contain Hello world!\n";
+ }
+
$test3->mustSucceed("firefox http://test1:8080/HelloWorld2 &");
- $test3->mustSucceed("sleep 15");
-
+ $test3->waitForWindow(qr/Namoroka/);
+ $test3->mustSucceed("sleep 30");
$test3->screenshot("screen");
'';
};
Modified: disnix/examples/HelloWorldExample/trunk/release-simple.nix
==============================================================================
--- disnix/examples/HelloWorldExample/trunk/release-simple.nix Sat Dec 18
22:57:36 2010 (r25195)
+++ disnix/examples/HelloWorldExample/trunk/release-simple.nix Sat Dec 18
23:42:41 2010 (r25196)
@@ -43,12 +43,21 @@
networkFile = "deployment/DistributedDeployment/network.nix";
testScript =
''
- $test1->waitForFile("/var/tomcat/webapps/HelloWorld");
- $test1->mustSucceed("sleep 30; curl --fail
http://test1:8080/HelloWorld/index.jsp >&2");
-
+ $test1->waitForFile("/var/tomcat/webapps/HelloWorld");
+ my $result = $test1->mustSucceed("sleep 30; curl --fail
http://test1:8080/HelloWorld/index.jsp";);
+
+ # The entry page should contain Hello World
+
+ if ($result =~ /Hello world/) {
+ print "Entry page contains: Hello world!\n";
+ }
+ else {
+ die "Entry page should contain Hello world!\n";
+ }
+
$test3->mustSucceed("firefox http://test1:8080/HelloWorld &");
- $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
