From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Wed, 16 Sep 2015 12:28:54 +0000 (+0100)
Subject: Executive: cs-job-create: Check that OSSTEST_FLIGHT is not set
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f58b2d704df6251abe550bf61d80fc2b08273d16;p=osstest.git

Executive: cs-job-create: Check that OSSTEST_FLIGHT is not set

If OSSTEST_FLIGHT is set on entry to JobDB::Executive::flight_create,
fail.  This obviously represents some kind of mistake.

One effect is that standalone-generate-dump-flight-runvars won't fill
an Executive database with test flights.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/Osstest/JobDB/Executive.pm b/Osstest/JobDB/Executive.pm
index cc52f57..6ba3d37 100644
--- a/Osstest/JobDB/Executive.pm
+++ b/Osstest/JobDB/Executive.pm
@@ -89,6 +89,8 @@ END
 
 sub flight_create ($$$) { #method
     my ($jd,$intended,$branch) = @_;
+    die "OSSTEST_FLIGHT set on entry to JobDB::Executive::flight_create\n"
+	if $ENV{'OSSTEST_FLIGHT'};
     $dbh_tests->do(<<END, {}, $branch, $intended);
              INSERT INTO flights
                          (flight,  started, blessing,       branch, intended)