Merge pull request #2162 from devos50/multichain_move_tests

Moved multichain tests to Tribler/Test/Community/Multichain directory
Tribler · May 9, 2016 · 0b6cce9 · 0b6cce9
2 parents 09f046f + fc817d2
commit 0b6cce9
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/Tribler/Test/Community/Multichain/__init__.py b/Tribler/Test/Community/Multichain/__init__.py
@@ -0,0 +1,3 @@
+"""
+This package contains tests for the Multichain community in Tribler.
+"""
diff --git a/Tribler/Test/test_multichain_community.py → ...y/Multichain/test_multichain_community.py b/Tribler/Test/test_multichain_community.py → ...y/Multichain/test_multichain_community.py
diff --git a/Tribler/Test/test_multichain_conversion.py → .../Multichain/test_multichain_conversion.py b/Tribler/Test/test_multichain_conversion.py → .../Multichain/test_multichain_conversion.py
@@ -1,7 +1,8 @@
 import logging
 from hashlib import sha1
 from struct import unpack
-from Tribler.Test.test_multichain_utilities import TestBlock, MultiChainTestCase
+
+from Tribler.Test.Community.Multichain.test_multichain_utilities import TestBlock, MultiChainTestCase
 from Tribler.community.multichain.conversion import (MultiChainConversion, split_function, signature_format,
                                                      append_format)
 from Tribler.community.multichain.community import SIGNATURE, CRAWL_REQUEST, CRAWL_RESPONSE, CRAWL_RESUME

diff --git a/Tribler/Test/test_multichain_database.py → ...ty/Multichain/test_multichain_database.py b/Tribler/Test/test_multichain_database.py → ...ty/Multichain/test_multichain_database.py
@@ -1,8 +1,8 @@
-import unittest
 import datetime
 import os
 from math import pow
-from Tribler.Test.test_multichain_utilities import TestBlock, MultiChainTestCase
+
+from Tribler.Test.Community.Multichain.test_multichain_utilities import TestBlock, MultiChainTestCase
 from Tribler.community.multichain.database import MultiChainDB
 from Tribler.community.multichain.database import DATABASE_DIRECTORY
 

diff --git a/Tribler/Test/test_multichain_startup.py → ...ity/Multichain/test_multichain_startup.py b/Tribler/Test/test_multichain_startup.py → ...ity/Multichain/test_multichain_startup.py
diff --git a/Tribler/Test/test_multichain_utilities.py → ...y/Multichain/test_multichain_utilities.py b/Tribler/Test/test_multichain_utilities.py → ...y/Multichain/test_multichain_utilities.py