Saving progress.

StorjOld · Feb 29, 2016 · 8538928 · 8538928
1 parent 7c4b142
commit 8538928
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/storjnode/network/bandwidth/test.py b/storjnode/network/bandwidth/test.py
@@ -343,10 +343,7 @@ def start(self, node_unl, test_size=None, timeout=None):
             )
         except MemoryError:
             _log.debug("memory error")
-<<<<<<< HEAD
-=======
             shard.close()
->>>>>>> develop
             self.reset_state()
             return
 

diff --git a/tests/network/bandwidth_test_with_dht.py b/tests/network/bandwidth_test_with_dht.py
@@ -139,7 +139,7 @@ def rejection_results(ret):
 
 
 class TestBandwidthTestWithDHT(unittest.TestCase):
-    # @unittest.skip("Too slow")
+    @unittest.skip("Too slow")
     def test_bandwidth_test_with_dht(self):
         bandwidth_test_with_dht()