shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

tests: fix reader for runner

Browse Source 
Since we now push more data into journal, parser reading this file
for --continue mode need to be adapted.
Also properly align batch mode with '.' for max test length name.
This commit is contained in:
Zdenek Kabelac 2023-10-03 21:28:34 +02:00
parent cf46f4baee
commit 8f61a127b5
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/lib/brick-shelltest.h
View File

@ -289,7 +289,7 @@ struct Journal {
writ = written.find( i->first ); writ = written.find( i->first );
if ( writ == written.end() || writ->second != i->second ) { if ( writ == written.end() || writ->second != i->second ) {
RUsage::const_iterator ru = rusage.find( i->first ); RUsage::const_iterator ru = rusage.find( i->first );
of << size_max << std::left << std::setw( (int)size_max ) << std::setfill( ' ' ) of << std::left << std::setw( (int)size_max ) << std::setfill( ' ' )
<< i->first << " " << std::setw( 12 ) << i->second; << i->first << " " << std::setw( 12 ) << i->second;
if (ru != rusage.end()) if (ru != rusage.end())
of << ru->second; of << ru->second;
@ -314,8 +314,8 @@ struct Journal {
std::ofstream of( path.c_str() ); std::ofstream of( path.c_str() );
for ( Status::const_iterator i = status.begin(); i != status.end(); ++i ) for ( Status::const_iterator i = status.begin(); i != status.end(); ++i )
of << i->first << " " << i->second << std::endl; of << i->first << " " << i->second << std::endl;
of.flush(); of.flush();
of.close(); of.close();
} }
void sync() { void sync() {
@ -375,13 +375,17 @@ struct Journal {
void read( const std::string &n ) { void read( const std::string &n ) {
std::ifstream ifs( n.c_str() ); std::ifstream ifs( n.c_str() );
typedef std::istream_iterator< std::pair< std::string, R > > It; typedef std::istream_iterator< std::pair< std::string, R > > It;
for ( It i( ifs ); i != It(); ++i ) for ( std::string line; std::getline( ifs, line ); ) {
std::istringstream iss( line );
It i( iss );
status[ i->first ] = i->second; status[ i->first ] = i->second;
}
} }
void read() { read( location ); } void read() { read( location ); }
void check_name_size( const std::string &n ) { if ( n.size() > size_max ) size_max = n.size(); } void check_name_size( const std::string &n ) { if ( n.size() > size_max ) size_max = n.size(); }
size_t name_size_max() const { return size_max; }
Journal( const std::string &dir ); Journal( const std::string &dir );
~Journal(); ~Journal();
@ -851,7 +855,7 @@ struct TestProcess
_exit( 202 ); _exit( 202 );
} }
TestProcess( std::string file ) : TestProcess( const std::string &file ) :
filename( file ), interactive( false ), fd( -1 ) filename( file ), interactive( false ), fd( -1 )
{ {
} }
@ -948,7 +952,7 @@ struct TestCase {
int nfds = io.fd_set_( &set ); int nfds = io.fd_set_( &set );
if ( !options.verbose && !options.interactive && !options.batch ) { if ( !options.verbose && !options.interactive && !options.batch ) {
if ( last_update.elapsed().sec() >= 1 ) { if ( last_update.elapsed().sec() ) {
progress( Update ) << tag( "running" ) progress( Update ) << tag( "running" )
<< pretty() << " " << start.elapsed() << std::flush; << pretty() << " " << start.elapsed() << std::flush;
last_update.gettime(); last_update.gettime();
@ -1058,7 +1062,8 @@ struct TestCase {
journal->done( id(), r, ru ); journal->done( id(), r, ru );
if ( options.batch ) { if ( options.batch ) {
int spaces = std::max( 64 - int(pretty().length()), 0 ); int spaces = std::max( int(journal->name_size_max()) - int(pretty().length()), 0 );
progress( Last ) << " " << std::string( spaces, '.' ) << " " progress( Last ) << " " << std::string( spaces, '.' ) << " "
<< std::left << std::setw( 9 ) << std::setfill( ' ' ) << r; << std::left << std::setw( 9 ) << std::setfill( ' ' ) << r;
if ( r != Journal::SKIPPED ) if ( r != Journal::SKIPPED )