Packaging: Moved tests/ and testing/ into mailpile/tests/

.gitignore

@@ -18,9 +18,9 @@ static/default/plugins/
 *.swo
 .vagrant
 .coverage
-testing/tmp
-testing/gpg-keyring/random_seed
+mailpile/tests/data/tmp
+mailpile/tests/data/gpg-keyring/random_seed
 ghostdriver.log
 cover/
 bower_components/
-node_modules/
+node_modules/

Makefile

@@ -66,7 +66,7 @@ web: less js
 	@true
 
 alltests: clean pytests
-	@chmod go-rwx testing/gpg-keyring
+	@chmod go-rwx mailpile/tests/data/gpg-keyring
 	@python2 scripts/mailpile-test.py || true
 	@nosetests
 
@@ -85,11 +85,19 @@ pytests:
 	@echo
 
 clean:
-	@rm -f `find . -name \\*.pyc` mailpile-tmp.py mailpile.py
-	@rm -f `find . -name \\*.mo`
-	@rm -f .appver MANIFEST setup.cfg .SELF .*deps
-	@rm -f scripts/less-compiler.mk
-	@rm -rf *.egg-info build/ mp-virtualenv/ dist/ testing/tmp/
+	@rm -f `find . -name \\*.pyc` \
+	       `find . -name \\*.mo` \
+               mailpile-tmp.py mailpile.py \
+	       .appver MANIFEST setup.cfg .SELF .*deps \
+	       scripts/less-compiler.mk
+	@rm -rf *.egg-info build/ mp-virtualenv/ dist/ \
+               mailpile/tests/data/tmp/ testing/tmp/
+
+sdist: clean
+	@python setup.py sdist
+
+bdist: compilemessages
+	@python setup.py bdist
 
 virtualenv:
 	virtualenv -p python2 mp-virtualenv

tests/__init__.py → mailpile/tests/__init__.py

@@ -22,7 +22,7 @@
 
 
 def get_mailpile_root():
-    return os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+    return os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
 
 TAGS = {
     'New': {
@@ -74,15 +74,16 @@ def get_shared_mailpile():
     sys.stderr.write('Preparing shared Mailpile test environment, '
                      'please wait. 8-)\n')
 
+    rootdir = get_mailpile_root()
+    datadir = os.path.join(rootdir, 'mailpile', 'tests', 'data')
+    gpgdir = os.path.join(datadir, 'gpg-keyring')
+    tmpdir = os.path.join(datadir, 'tmp')
+    test_data = os.path.join(datadir, 'Maildir')
+
     # force usage of test keyring whenever the test mailpile instance is used
-    os.chmod(os.path.join(get_mailpile_root(), 'testing', 'gpg-keyring'),
-             stat.S_IRUSR|stat.S_IWUSR|stat.S_IXUSR)
+    os.chmod(gpgdir, stat.S_IRUSR|stat.S_IWUSR|stat.S_IXUSR)
     global GNUPG_HOMEDIR
-    GNUPG_HOMEDIR = os.path.join(get_mailpile_root(), 'testing', 'gpg-keyring')
-
-    workdir = get_mailpile_root()
-    tmpdir = os.path.join(workdir, 'testing', 'tmp')
-    test_data = os.path.join(workdir, 'testing', 'Maildir')
+    GNUPG_HOMEDIR = gpgdir
 
     if os.path.exists(tmpdir):
         shutil.rmtree(tmpdir)

tests/gui/__init__.py → mailpile/tests/gui/__init__.py

@@ -9,7 +9,7 @@
     pass
 
 from mailpile.httpd import HttpWorker
-from tests import MailPileUnittest, get_shared_mailpile
+from mailpile.tests import MailPileUnittest, get_shared_mailpile
 
 from mailpile.safe_popen import MakePopenUnsafe
 

tests/gui/test_contacts.py → mailpile/tests/gui/test_contacts.py

@@ -1,4 +1,4 @@
-from tests.gui import MailpileSeleniumTest
+from mailpile.tests.gui import MailpileSeleniumTest
 
 
 class ContactsGuiTest(MailpileSeleniumTest):

tests/gui/test_mail.py → mailpile/tests/gui/test_mail.py

@@ -1,4 +1,4 @@
-from tests.gui import MailpileSeleniumTest
+from mailpile.tests.gui import MailpileSeleniumTest
 
 
 class MailGuiTest(MailpileSeleniumTest):

tests/gui/test_tags.py → mailpile/tests/gui/test_tags.py

@@ -3,7 +3,7 @@
 except ImportError:
     pass
 
-from tests.gui import MailpileSeleniumTest
+from mailpile.tests.gui import MailpileSeleniumTest
 
 
 class TagGuiTest(MailpileSeleniumTest):

tests/test_command.py → mailpile/tests/test_command.py

@@ -1,9 +1,10 @@
 import unittest
-import mailpile
+import os
 from mock import patch
-from mailpile.commands import Action as action
 
-from tests import MailPileUnittest
+import mailpile
+from mailpile.commands import Action as action
+from mailpile.tests import MailPileUnittest
 
 
 class TestCommands(MailPileUnittest):
@@ -31,11 +32,11 @@ def test_unset(self):
         self.assertEqual(results.result['stats']['count'], 3)
 
     def test_add(self):
-        res = self.mp.add("tests")
+        res = self.mp.add("scripts")
         self.assertEqual(res.as_dict()["result"], True)
 
     def test_add_mailbox_already_in_pile(self):
-        res = self.mp.add("tests")
+        res = self.mp.add("scripts")
         self.assertEqual(res.as_dict()["result"], True)
 
     def test_add_mailbox_no_such_directory(self):
@@ -146,7 +147,7 @@ def test_key_receive(self):
 
     def test_key_import(self):
         res = action(self.mp._session, "crypto/gpg/importkey",
-                                       'testing/pub.key')
+                     os.path.join('mailpile', 'tests', 'data', 'pub.key'))
         self.assertEqual(res.result["results"]["count"], 1)
 
     def test_nicknym_get_key(self):

tests/test_config.py → mailpile/tests/test_config.py

@@ -3,7 +3,7 @@
 import mailpile
 
 from nose.tools import raises
-from tests import MailPileUnittest
+from mailpile.tests import MailPileUnittest
 
 class TestConfig(MailPileUnittest):
 

tests/test_crypto_policy.py → mailpile/tests/test_crypto_policy.py

@@ -1,5 +1,5 @@
 from mailpile.vcard import MailpileVCard, VCardLine
-from tests import MailPileUnittest
+from mailpile.tests import MailPileUnittest
 
 VCARD_CRYPTO_POLICY = 'X-MAILPILE-CRYPTO-POLICY'
 

tests/test_eventlog.py → mailpile/tests/test_eventlog.py

@@ -7,13 +7,13 @@
 import time
 
 from nose.tools import raises
-from tests import MailPileUnittest
+from mailpile.tests import MailPileUnittest
 
 
 EVENT_ID_RE = re.compile("[a-f0-9]{8}\.[a-f0-9]{5}\.[a-f0-9]+")
 
-mailpile_root = os.path.join(os.path.dirname(__file__), "..")
-mailpile_tmp  = os.path.join(mailpile_root, "testing/tmp")
+mailpile_root = os.path.join(os.path.dirname(__file__), "..", "..")
+mailpile_tmp  = os.path.join(mailpile_root, "mailpile", "tests", "data", "tmp")
 
 class TestEventlog(MailPileUnittest):
 

tests/test_keylookup.py → mailpile/tests/test_keylookup.py

@@ -1,8 +1,8 @@
 from mock import patch
-from tests import MailPileUnittest
 import datetime
 
-from tests import get_shared_mailpile
+from mailpile.tests import MailPileUnittest
+from mailpile.tests import get_shared_mailpile
 
 from mailpile.plugins.keylookup import lookup_crypto_keys, KeyserverLookupHandler
 from mailpile.plugins.keylookup.email_keylookup import *

tests/test_performance.py → mailpile/tests/test_performance.py

@@ -1,7 +1,7 @@
 import unittest
 from nose.tools import assert_equal, assert_less
 
-from tests import get_shared_mailpile, MailPileUnittest
+from mailpile.tests import get_shared_mailpile, MailPileUnittest
 
 
 def checkSearch(postinglist_kb, query):

tests/test_plugin.py → mailpile/tests/test_plugin.py

@@ -1,7 +1,7 @@
 import shutil
 import os
 from os import path
-from tests import MailPileUnittest
+from mailpile.tests import MailPileUnittest
 import json
 
 

tests/test_search.py → mailpile/tests/test_search.py

@@ -1,7 +1,7 @@
 import unittest
 from nose.tools import assert_equal, assert_less
 
-from tests import get_shared_mailpile
+from mailpile.tests import get_shared_mailpile
 
 
 def checkSearch(query, expected_count=1):

tests/test_ui.py → mailpile/tests/test_ui.py

@@ -2,7 +2,7 @@
 import mailpile
 from mailpile.ui import UserInteraction
 
-from tests import capture, MailPileUnittest
+from mailpile.tests import capture, MailPileUnittest
 
 
 class TestUI(MailPileUnittest):

tests/test_vcard.py → mailpile/tests/test_vcard.py

@@ -1,7 +1,7 @@
 import unittest
 import mailpile
 
-from tests import MailPileUnittest
+from mailpile.tests import MailPileUnittest
 
 class TestVCard(MailPileUnittest):
 

scripts/mailpile-test.py

@@ -14,7 +14,7 @@
 
 # Set up some paths
 mailpile_root = os.path.join(os.path.dirname(__file__), '..')
-mailpile_test = os.path.join(mailpile_root, 'testing')
+mailpile_test = os.path.join(mailpile_root, 'mailpile', 'tests', 'data')
 mailpile_send = os.path.join(mailpile_root, 'scripts', 'test-sendmail.sh')
 mailpile_home = os.path.join(mailpile_test, 'tmp')
 mailpile_gpgh = os.path.join(mailpile_test, 'gpg-keyring')

scripts/test-sendmail.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-OUTPUT="$(dirname $0)/../testing/tmp/sent.mbx"
+OUTPUT="$(dirname $0)/../mailpile/tests/data/tmp/sent.mbx"
 mkdir -p "$(dirname $OUTPUT)"
 touch "$OUTPUT"
 if [ -f "$OUTPUT" ]; then

testing-data

@@ -0,0 +1 @@
+mailpile/tests/data/