From 5dc39af3ac1f815cf067005fd3f30ba31020bae0 Mon Sep 17 00:00:00 2001
From: Vlad Gluhovsky <gluk256@gmail.com>
Date: Fri, 7 Aug 2015 16:54:01 +0200
Subject: [PATCH 1/2] nonetwork check added

---
 test/libp2p/net.cpp           | 2 +-
 test/libwhisper/whisperDB.cpp | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/libp2p/net.cpp b/test/libp2p/net.cpp
index 7ab8d00cc..f26907cf5 100644
--- a/test/libp2p/net.cpp
+++ b/test/libp2p/net.cpp
@@ -339,7 +339,7 @@ BOOST_AUTO_TEST_SUITE(netTypes)
 
 BOOST_AUTO_TEST_CASE(deadlineTimer)
 {
-	if (test::Options::get().nonetwork)
+	//if (test::Options::get().nonetwork)
 		return;
 
 	ba::io_service io;
diff --git a/test/libwhisper/whisperDB.cpp b/test/libwhisper/whisperDB.cpp
index a62539bfd..fb1fa2917 100644
--- a/test/libwhisper/whisperDB.cpp
+++ b/test/libwhisper/whisperDB.cpp
@@ -24,6 +24,7 @@ along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 #include <libp2p/Host.h>
 #include <libwhisper/WhisperDB.h>
 #include <libwhisper/WhisperHost.h>
+#include <test/TestHelper.h>
 
 using namespace std;
 using namespace dev;
@@ -130,6 +131,9 @@ BOOST_AUTO_TEST_CASE(persistence)
 
 BOOST_AUTO_TEST_CASE(messages)
 {
+	if (test::Options::get().nonetwork)
+		return;
+
 	cnote << "Testing load/save Whisper messages...";
 	VerbosityHolder setTemporaryLevel(2);
 	unsigned const TestSize = 3;
@@ -211,6 +215,9 @@ BOOST_AUTO_TEST_CASE(corruptedData)
 
 BOOST_AUTO_TEST_CASE(filters)
 {
+	if (test::Options::get().nonetwork)
+		return;
+
 	cnote << "Testing filters saving...";
 	VerbosityHolder setTemporaryLevel(2);
 	h256 persistID(0xC0FFEE);

From 3a0f5a7fc8333b0e463e6eecb3f46d646e0a7036 Mon Sep 17 00:00:00 2001
From: Vlad Gluhovsky <gluk256@gmail.com>
Date: Fri, 7 Aug 2015 17:07:56 +0200
Subject: [PATCH 2/2] bugfix

---
 test/libp2p/net.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/libp2p/net.cpp b/test/libp2p/net.cpp
index f26907cf5..7ab8d00cc 100644
--- a/test/libp2p/net.cpp
+++ b/test/libp2p/net.cpp
@@ -339,7 +339,7 @@ BOOST_AUTO_TEST_SUITE(netTypes)
 
 BOOST_AUTO_TEST_CASE(deadlineTimer)
 {
-	//if (test::Options::get().nonetwork)
+	if (test::Options::get().nonetwork)
 		return;
 
 	ba::io_service io;