Move tests into PyGitUp package

See #51

Author: msiemens

.gitignore

@@ -34,8 +34,5 @@ nosetests.xml
 .project
 .pydevproject
 
-# Test repos
-tests/*/
-
 # PyCharm
-.idea/
+.idea/

PyGitUp/gitup.py

@@ -246,7 +246,6 @@ def rebase_all_branches(self):
                 if target.name.startswith('./'):
                     # Check, if local branch exists
                     self.git.rev_parse(target.name[2:])
-
                 else:
                     # Check, if remote branch exists
                     _ = target.commit

tests/__init__.py PyGitUp/tests/__init__.py

@@ -2,12 +2,10 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
-from tests import basepath, write_file, init_master
+from PyGitUp.tests import basepath, write_file, init_master
 
 test_name = 'ahead-of-upstream'
 testfile_name = 'file'

tests/test_ahead_of_upstream.py PyGitUp/tests/test_ahead_of_upstream.py

@@ -4,14 +4,10 @@
 import subprocess
 from os.path import join
 
-import six
-
-# 3rd party libs
-from nose.plugins.skip import SkipTest
 from git import *
+from nose.plugins.skip import SkipTest
 
-# PyGitup imports
-from tests import basepath, write_file, init_master
+from PyGitUp.tests import basepath, write_file, init_master
 
 test_name = 'bundler'
 repo_path = join(basepath, test_name + os.sep)

tests/test_bundler.py PyGitUp/tests/test_bundler.py

@@ -2,13 +2,11 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
-from tests import basepath, init_master, update_file
 from PyGitUp.git_wrapper import GitError
+from PyGitUp.tests import basepath, init_master, update_file
 
 test_name = 'detached'
 repo_path = join(basepath, test_name + os.sep)

tests/test_detached.py PyGitUp/tests/test_detached.py

@@ -2,12 +2,10 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
-from tests import basepath, init_master, update_file
+from PyGitUp.tests import basepath, init_master, update_file
 
 test_name = 'diverged'
 repo_path = join(basepath, test_name + os.sep)

tests/test_diverged.py PyGitUp/tests/test_diverged.py

@@ -2,12 +2,10 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
-from tests import basepath, init_master, update_file
+from PyGitUp.tests import basepath, init_master, update_file
 
 test_name = 'fast-forwarded'
 repo_path = join(basepath, test_name + os.sep)

tests/test_fast_forwarded.py PyGitUp/tests/test_fast_forwarded.py

@@ -2,13 +2,11 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
 from PyGitUp.git_wrapper import GitError
-from tests import basepath, init_master, update_file
+from PyGitUp.tests import basepath, init_master, update_file
 
 test_name = 'test-fail'
 repo_path = join(basepath, test_name + os.sep)

tests/test_fetch_fail.py PyGitUp/tests/test_fetch_fail.py

@@ -2,12 +2,10 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
-from tests import basepath, init_master, capture
+from PyGitUp.tests import basepath, init_master, capture
 
 test_name = 'fetch-all'
 repo_path = join(basepath, test_name + os.sep)

tests/test_fetchall.py PyGitUp/tests/test_fetchall.py

@@ -2,12 +2,10 @@
 import os
 from os.path import join
 
-# 3rd party libs
 from nose.tools import *
 
-# PyGitup imports
-from tests import basepath
 from PyGitUp.git_wrapper import GitError
+from PyGitUp.tests import basepath
 
 test_name = 'git-not-in-path'
 repo_path = join(basepath, test_name + os.sep)

tests/test_git_not_in_path.py PyGitUp/tests/test_git_not_in_path.py

@@ -2,11 +2,9 @@
 import os
 from os.path import join
 
-# 3rd party libs
 from nose.tools import *
 
-# PyGitup imports
-from tests import basepath, init_master, update_file
+from PyGitUp.tests import basepath, init_master, update_file
 
 test_name = 'local_tracking'
 repo_path = join(basepath, test_name + os.sep)

tests/test_local_tracking.py PyGitUp/tests/test_local_tracking.py

@@ -3,12 +3,10 @@
 import platform
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
-from tests import basepath, init_master, update_file
+from PyGitUp.tests import basepath, init_master, update_file
 
 test_name = 'log-hook'
 repo_path = join(basepath, test_name + os.sep)

tests/test_log_hook.py PyGitUp/tests/test_log_hook.py

@@ -2,12 +2,10 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
-from tests import basepath, init_master, update_file
+from PyGitUp.tests import basepath, init_master, update_file
 
 test_name = 'multiple-remotes'
 repo_path = join(basepath, test_name + os.sep)

tests/test_multiple_remotes.py PyGitUp/tests/test_multiple_remotes.py

@@ -1,12 +1,10 @@
 # System imports
 import os
 
-# 3rd party libs
 from nose.tools import *
 
-# PyGitup imports
-from tests import init_master
 from PyGitUp.git_wrapper import GitError
+from PyGitUp.tests import init_master
 
 test_name = 'no_remotes'
 

tests/test_no_remotes.py PyGitUp/tests/test_no_remotes.py

@@ -2,12 +2,10 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
-from tests import basepath, capture, update_file, init_master
+from PyGitUp.tests import basepath, capture, update_file, init_master
 
 test_name = 'no-fetch'
 new_branch_name = test_name + '.2'

tests/test_nofetch.py PyGitUp/tests/test_nofetch.py

@@ -2,12 +2,10 @@
 import os
 from os.path import join
 
-# 3rd party libs
 from nose.tools import *
 
-# PyGitup imports
-from tests import basepath
 from PyGitUp.git_wrapper import GitError
+from PyGitUp.tests import basepath
 
 test_name = 'not-on-a-repo'
 repo_path = join(basepath, test_name + os.sep)

tests/test_not_on_a_git_repo.py PyGitUp/tests/test_not_on_a_git_repo.py

@@ -2,12 +2,10 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
-from tests import basepath, write_file, init_master
+from PyGitUp.tests import basepath, write_file, init_master
 
 test_name = 'out-of-tree'
 testfile_name = 'file'

tests/test_out_of_tree.py PyGitUp/tests/test_out_of_tree.py

@@ -2,13 +2,11 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
 from PyGitUp.git_wrapper import RebaseError
-from tests import basepath, init_master, update_file, write_file
+from PyGitUp.tests import basepath, init_master, update_file, write_file
 
 test_name = 'overwrite_untracked_error'
 repo_path = join(basepath, test_name + os.sep)

tests/test_overwrite_untracked_error.py PyGitUp/tests/test_overwrite_untracked_error.py

@@ -2,13 +2,11 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
-from tests import basepath, write_file, init_master, update_file, testfile_name
 from PyGitUp.git_wrapper import RebaseError
+from PyGitUp.tests import basepath, write_file, init_master, update_file, testfile_name
 
 test_name = 'rebase-arguments'
 repo_path = join(basepath, test_name + os.sep)

tests/test_rebase_arguments.py PyGitUp/tests/test_rebase_arguments.py

@@ -2,13 +2,11 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
-from PyGitUp.git_wrapper import GitError, RebaseError
-from tests import basepath, write_file, init_master, update_file, testfile_name
+from PyGitUp.git_wrapper import RebaseError
+from PyGitUp.tests import basepath, write_file, init_master, update_file, testfile_name
 
 test_name = 'rebase_error'
 repo_path = join(basepath, test_name + os.sep)

tests/test_rebase_error.py PyGitUp/tests/test_rebase_error.py

@@ -2,12 +2,10 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
-from tests import basepath, write_file, init_master, update_file, testfile_name
+from PyGitUp.tests import basepath, write_file, init_master, update_file, testfile_name
 
 test_name = 'rebasing'
 repo_path = join(basepath, test_name + os.sep)

tests/test_rebasing.py PyGitUp/tests/test_rebasing.py

@@ -2,12 +2,10 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
-from tests import basepath, init_master
+from PyGitUp.tests import basepath, init_master
 
 test_name = 'remote-branch-deleted'
 new_branch_name = test_name + '.2'

tests/test_remote_branch_deleted.py PyGitUp/tests/test_remote_branch_deleted.py

@@ -2,12 +2,10 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
-from tests import basepath, init_master, update_file
+from PyGitUp.tests import basepath, init_master, update_file
 
 test_name = 'returning-to-branch'
 new_branch_name = test_name + '.2'

tests/test_returning_to_branch.py PyGitUp/tests/test_returning_to_branch.py

@@ -2,13 +2,11 @@
 import os
 from os.path import join
 
-# 3rd party libs
-from nose.tools import *
 from git import *
+from nose.tools import *
 
-# PyGitup imports
-from PyGitUp.git_wrapper import GitError, StashError
-from tests import basepath, write_file, init_master, testfile_name
+from PyGitUp.git_wrapper import StashError
+from PyGitUp.tests import basepath, write_file, init_master, testfile_name
 
 test_name = 'stash_error'
 repo_path = join(basepath, test_name + os.sep)