minor cleanup
This commit is contained in:
		@@ -6,8 +6,6 @@
 | 
			
		||||
 | 
			
		||||
#include "IXConnectionState.h"
 | 
			
		||||
 | 
			
		||||
#include <sstream>
 | 
			
		||||
 | 
			
		||||
namespace ix
 | 
			
		||||
{
 | 
			
		||||
    std::atomic<uint64_t> ConnectionState::_globalId(0);
 | 
			
		||||
@@ -19,9 +17,7 @@ namespace ix
 | 
			
		||||
 | 
			
		||||
    void ConnectionState::computeId()
 | 
			
		||||
    {
 | 
			
		||||
        std::stringstream ss;
 | 
			
		||||
        ss << _globalId++;
 | 
			
		||||
        _id = ss.str();
 | 
			
		||||
        _id = std::to_string(_globalId++);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    const std::string& ConnectionState::getId() const
 | 
			
		||||
 
 | 
			
		||||
@@ -212,6 +212,10 @@ TEST_CASE("Websocket_heartbeat", "[heartbeat]")
 | 
			
		||||
        webSocketClientA.stop();
 | 
			
		||||
        webSocketClientB.stop();
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        // Here we test heart beat period exceeded for clientA
 | 
			
		||||
        // but it should not be exceeded for clientB which has sent data.
 | 
			
		||||
        // -> expected ping messages == 2, but add a small buffer to make this more reliable.
 | 
			
		||||
        REQUIRE(serverReceivedPingMessages >= 2);
 | 
			
		||||
        REQUIRE(serverReceivedPingMessages <= 4);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -27,7 +27,7 @@ class Command(object):
 | 
			
		||||
        thread.join(timeout)
 | 
			
		||||
 | 
			
		||||
        if thread.is_alive():
 | 
			
		||||
            print 'Command timeout, kill it: ' + self.cmd
 | 
			
		||||
            print('Command timeout, kill it: ' + self.cmd)
 | 
			
		||||
            self.process.terminate()
 | 
			
		||||
            thread.join()
 | 
			
		||||
            return False, 255
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user