shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-26 22:50:36 +03:00
Code Releases Activity

test: Implement --fatal-timeouts to allow a timely VM restart.

Browse Source
This commit is contained in:
Petr Rockai 2014-07-01 21:34:06 +02:00
parent 34e818042e
commit eec99ffa8c
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/lib/journal.h
View File

@ -89,6 +89,7 @@ struct Journal {
Status status, written;
std::string location, list;
int timeouts;
void append( std::string path ) {
std::ofstream of( path.c_str(), std::fstream::app );
@ -126,6 +127,10 @@ struct Journal {
void done( std::string n, R r ) {
status[ n ] = r;
if ( r == TIMEOUT )
++ timeouts;
else
timeouts = 0;
sync();
}
@ -165,7 +170,8 @@ struct Journal {
Journal( std::string dir )
: location( dir + "/journal" ),
list( dir + "/list" )
list( dir + "/list" ),
timeouts( 0 )
{}
};

16
test/lib/runner.cpp
View File

@ -60,10 +60,11 @@ bool fatal_signal = false;
bool interrupt = false;
struct Options {
bool verbose, batch, interactive, cont;
bool verbose, batch, interactive, cont, fatal_timeouts;
std::string testdir, outdir;
std::vector< std::string > flavours, filter;
Options() : verbose( false ), batch( false ), interactive( false ), cont( false ) {}
Options() : verbose( false ), batch( false ), interactive( false ),
cont( false ), fatal_timeouts( false ) {}
};
struct TestProcess
@ -409,6 +410,14 @@ struct Main {
i->run();
if ( options.fatal_timeouts && journal.timeouts >= 2 ) {
journal.started( i->id() ); // retry the test on --continue
std::cerr << "E: Hit 2 timeouts in a row with --fatal-timeouts" << std::endl;
std::cerr << "Suspending (please restart the VM)." << std::endl;
sleep( 3600 );
die = 1;
}
if ( time(0) - start > 3 * 3600 ) {
std::cerr << "3 hours passed, giving up..." << std::endl;
die = 1;
@ -503,6 +512,9 @@ int main(int argc, char **argv)
if ( args.has( "--only" ) )
split( args.opt( "--only" ), opt.filter );
if ( args.has( "--fatal-timeouts" ) )
opt.fatal_timeouts = true;
if ( args.has( "--batch" ) || hasenv( "BATCH" ) ) {
opt.verbose = false;
opt.batch = true;