Merge #7490: tests: Remove May15 test

acf5983 tests: Remove May15 test (Wladimir J. van der Laan)

2 files changed, 0 insertions, 67 deletions

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 468d3043a7..6ef6a69a2c 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -44,7 +44,6 @@ BITCOIN_TESTS =\
   test/base64_tests.cpp \
   test/bip32_tests.cpp \
   test/bloom_tests.cpp \
-  test/checkblock_tests.cpp \
   test/Checkpoints_tests.cpp \
   test/coins_tests.cpp \
   test/compress_tests.cpp \
diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp
deleted file mode 100644
index c945a95adc..0000000000
--- a/src/test/checkblock_tests.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2013-2015 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#include "clientversion.h"
-#include "consensus/validation.h"
-#include "main.h" // For CheckBlock
-#include "primitives/block.h"
-#include "test/test_bitcoin.h"
-#include "utiltime.h"
-
-#include <cstdio>
-
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/path.hpp>
-#include <boost/test/unit_test.hpp>
-
-
-BOOST_FIXTURE_TEST_SUITE(CheckBlock_tests, BasicTestingSetup)
-
-bool read_block(const std::string& filename, CBlock& block)
-{
-    namespace fs = boost::filesystem;
-    fs::path testFile = fs::current_path() / "data" / filename;
-#ifdef TEST_DATA_DIR
-    if (!fs::exists(testFile))
-    {
-        testFile = fs::path(BOOST_PP_STRINGIZE(TEST_DATA_DIR)) / filename;
-    }
-#endif
-    FILE* fp = fopen(testFile.string().c_str(), "rb");
-    if (!fp) return false;
-
-    fseek(fp, 8, SEEK_SET); // skip msgheader/size
-
-    CAutoFile filein(fp, SER_DISK, CLIENT_VERSION);
-    if (filein.IsNull()) return false;
-
-    filein >> block;
-
-    return true;
-}
-
-BOOST_AUTO_TEST_CASE(May15)
-{
-    // Putting a 1MB binary file in the git repository is not a great
-    // idea, so this test is only run if you manually download
-    // test/data/Mar12Fork.dat from
-    // http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/Mar12Fork.dat/download
-    unsigned int tMay15 = 1368576000;
-    SetMockTime(tMay15); // Test as if it was right at May 15
-
-    CBlock forkingBlock;
-    if (read_block("Mar12Fork.dat", forkingBlock))
-    {
-        CValidationState state;
-
-        // After May 15'th, big blocks are OK:
-        forkingBlock.nTime = tMay15; // Invalidates PoW
-        BOOST_CHECK(CheckBlock(forkingBlock, state, false, false));
-    }
-
-    SetMockTime(0);
-}
-
-BOOST_AUTO_TEST_SUITE_END()