summaryrefslogtreecommitdiff
path: root/git/test/test_submodule.py
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #541 from andy-maier/py26_fixesSebastian Thiel2016-12-081-1/+4
|\ | | | | Fixes to support Python 2.6 again.
| * Fixes to support Python 2.6 again.Andreas Maier2016-10-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Details: - Added Python 2.6 again to .travis.yml (it was removed in commit 4486bcb). - Replaced the use of dictionary comprehensions in `git/cmd.py` around line 800 with the code before that change (in commit 25a2ebf). Reason: dict comprehensions were introduced only in Python 2.7. - Changed the import source for `SkipTest` and `skipIf` from `unittest.case` to first trying `unittest` and upon ImportError from `unittest2`. This was done in `git/util.py` and in several testcases. Reason: `SkipTest` and `skipIf` were introduced to unittest only in Python 2.7, and `unittest2` is a backport of `unittest` additions to Python 2.6. - In git/test/lib/helper.py, fixed the definition of `assertRaisesRegex` to work on py26. - For Python 2.6, added the `unittest2` dependency to `requirements.txt` and changed `.travis.yml` to install `unittest2`. Because git/util.py uses SkipTest from unittest/unittest2, the dependency could not be added to `test-requirements.txt`. - Fixed an assertion in `git/test/test_index.py` to also allow a Python 2.6 specific exception message. - In `is_cygwin_git()` in `git/util.py`, replaced `check_output()` with `Popen()`. It was added in Python 2.7. - Enabled Python 2.6 for Windows: - Added Python 2.6 for MINGW in .appveyor.yml. - When defining `PROC_CREATIONFLAGS` in `git/cmd.py`, made use of certain win32 and subprocess flags that were introduced in Python 2.7, dependent on whether we run on Python 2.7 or higher. - In `AutoInterrupt.__del__()` in `git/cmd.py`, allowed for `os` not having `kill()`. `os.kill()` was added for Windows in Python 2.7 (For Linux, it existed in Python 2.6 already).
* | chore(lint): flake8Sebastian Thiel2016-12-081-1/+1
|/ | | | | | | | Interestingly only shows in particular python versions on travis. Maybe some caching effect? Locally it is reproducible easily, with the latest flake8
* Merge branch 'win_mmap' of https://github.com/ankostis/GitPython into ↵Sebastian Thiel2016-10-221-15/+1
|\ | | | | | | ankostis-win_mmap
| * fix(win_mmap): unmark hidden win_errors due to smmap unicode foesKostis Anagnostopoulos2016-10-221-1/+0
| | | | | | | | | | | | | | Now 2 more TCs pass in Windows: + TestRepo.test_file_handle_leaks() + TestObjDbPerformance.test_random_access() See https://github.com/gitpython-developers/smmap/pull/30
| * submodule-TCs: stop monekypatching smmap.MapRegion with files in WindowsKostis Anagnostopoulos2016-10-221-14/+0
| | | | | | | | Obviously it is not needed anymore, or nothing is worse without this monkeypatch.
* | Merge with latest branch 'exp_git_dir'Kostis Anagnostopoulos2016-10-191-18/+8
|\ \ | |/ |/| | | | | | | | | Conflicts: git/repo/base.py git/repo/fun.py git/test/test_submodule.py
| * repo: minor code and doc correcions.Kostis Anagnostopoulos2016-10-191-2/+2
| | | | | | | | | | | | | | + Expansion of paths also `osp.normalize()` them. + Make Repo-fields --> class-fields to avoid initializations on construct. + Explain and rename `git.repo.fun.find_git_dir()` is for submodules (`find_submodule_git_dir()`).
* | cygwin, appveyor, #533: Enable actual failures, hide certain 2+2 casesKostis Anagnostopoulos2016-10-161-6/+24
| |
* | ci, deps: no PY26, ddt>=1.1.1, CIs `pip install test-requirements`Kostis Anagnostopoulos2016-10-161-1/+1
| | | | | | | | + Use environment-markers in requirement files (see http://stackoverflow.com/a/33451105/548792).
* | cygwin, #533: polish abs-paths in `git add` commandsKostis Anagnostopoulos2016-10-161-1/+1
|/ | | | | | | | | | | + Modify TCs - no main-code changes. + FIXed: + `TestSubmodule.test_git_submodules_and_add_sm_with_new_commit()` + TestDiff.test_diff_with_staged_file() - Cygwin TCs failing: - PY2: err: 12, fail: 2 - PY3: err: 11, fail: 2
* config, #525: polish more config-urlsKostis Anagnostopoulos2016-10-121-36/+38
|
* daemon, #525: FIX remote urls in config-filesKostis Anagnostopoulos2016-10-121-1/+1
| | | | | | | | | | | | + Parse most remote & config-urls \-->/. + Used relative daemon-paths. + Use git-daemon PORT above 10k; on Windows all below need Admin rights. +FIXED git-daemon @with_rw_and_rw_remote_repo(): + test_base.test_with_rw_remote_and_rw_repo() PASS. + test_remote.test_base() now freezes! (so still hidden win_err) + repo_test: minor finally delete test-repos created inside this repo. + util: delete unused `absolute_project_path()`.
* FIX #526: Do not depend on test-sourcesKostis Anagnostopoulos2016-10-111-1/+1
| | | | | | + Move `HIDE_WINDOWS_KNOWN_ERRORS` flag from `git.test.lib.helper-->git.util`; regular modules in main-sources folder also depend on that flag. + Use unittest.SkipTest instead of from non-standard `nose` lib.
* io: Wrap (probably) allconfig_writers in `with` blocksKostis Anagnostopoulos2016-10-041-46/+39
|
* src: No PyDev warningsKostis Anagnostopoulos2016-10-041-3/+3
| | | | | | | | + Mark all unused vars and other non-pep8 (PyDev) warnings + test_utils: + enable & fix forgotten IterableList looped path. + unittestize all assertions. + remote: minor fix progress dispatching unknown err-lines
* hidden win-errs: Let leaking TCs run till end, then hideKostis Anagnostopoulos2016-10-041-8/+8
| | | | | | | | | + Detect code breaking the body of TCs eventually hidden win-errors by raising SkipTest ALAP. + submodule.base.py: import classes from `git.objects` instead of `utils`. + had to ++ ulimit 100->110 for the extra code tested (more leaks :-) + Centralize is_win detection.
* Appveyor: Set HIDE_WINDOWS_KNOWN_ERRORS=TrueKostis Anagnostopoulos2016-10-031-1/+1
| | | | | + Update error-conditions for PY-versions. + The purpose is to have NO TC FAILURES (with the minimum possible conditions).
* Appveyor: Add and set HIDE_WINDOWS_KNOWN_ERRORS=Falsewinerr_showKostis Anagnostopoulos2016-10-031-11/+21
| | | | | + Collect all "acknowledged" failing TCs on Appveyor and use "HIDE_WINDOWS_KNOWN_ERRORS" var to hide them.
* TST: Add test for removing submodule with remotes without refsYaroslav Halchenko2016-10-031-2/+20
|
* TC, #519: DISABLE failing testsKostis Anagnostopoulos2016-10-011-0/+4
| | | + Just to see Apveyor all green and merge; the TCs HAVE TO BE FIXED.
* Win, #519: FIX repo TCs.Kostis Anagnostopoulos2016-10-011-1/+2
| | | | | | | | | | | | | | | + FIX TestRepo.test_submodule_update(): + submod: del `.git` file prior overwrite; Windows denied otherwise! + FIX TestRepo.test_untracked_files(): + In the `git add <file>` case, it failed with unicode args on PY2. Had to encode them with `locale.getpreferredencoding()` AND use SHELL. + cmd: add `shell` into `execute()` kwds, for overriding USE_SHELL per command. + repo: replace blocky `communicate()` in `_clone()` with thread-pumps. + test_repo.py: unittestize (almost all) assertions. + Replace open --> with open for index (base and TC). + test_index.py: Enabled a dormant assertion.
* Win, #519: FIX with_rw_directory() to remove read-only dirsKostis Anagnostopoulos2016-09-281-1/+1
| | | | | + Stop using gitdb's respective helper. + Fix files chmod(555) which CANNOT DELETE on Windows (but do on Linux).
* src: constify is_<platform>() callsKostis Anagnostopoulos2016-09-281-1/+1
| | | + TCs: unittest-asserts for git-tests.
* src, #519: collect all is_<platform>() callsKostis Anagnostopoulos2016-09-271-2/+2
|
* win: GC.collect on all TC.tearDown to fix appveyor hang runsKostis Anagnostopoulos2016-09-261-0/+4
| | | | | + Fixed the hangs at `test_git:TestGit.test_handle_process_output()`. [travisci skip]
* fix(tests): remove dependency on sort orderSebastian Thiel2015-08-081-1/+1
| | | | | | | Now we select the submodule by name, not by index. The latter is not deterministic. Closes #335
* tests(submodule): add new submodule commitsSebastian Thiel2015-08-081-1/+32
| | | | | | | | It's somewhat more complex to add new commits in submodules to the parent repository. The new test shows how to do that in a 'GitPythonic' way. Related to #335
* Minor improvements to submodule test for windows portabilitySebastian Thiel2015-01-221-4/+4
| | | | | | | | | However, most tests fail for reasons unknown - SHA cannot be found. For now, I will wait until someone complains, as I doubt too many people will use it on windows. Related to #244
* Overhauled all tutorials, and placed them in a unit-test.Sebastian Thiel2015-01-221-9/+15
| | | | | | That way they are protected from regression. Fixes #239
* Initial set of documentation improvements, and a fix to the submodule tests.Sebastian Thiel2015-01-211-1/+1
| | | | | | Now travisci tests should work once again. Related to #239
* Assured that branch changes are properly handled.Sebastian Thiel2015-01-211-2/+65
| | | | | | | | | Previously we could try to remove the branch we are on. Of course, we have a test-case elaborate enough to verify we don't destroy changes in submodules accidentally. Therefore I am confident that this implementation is correct. Fixes #49
* Fixed flake8 and a minor test regression.Sebastian Thiel2015-01-201-2/+2
| | | | | The latter happened as now BadName is thrown, instead of BadObject. Changes.rst was marked accordingly
* Impemented keep_going flag for `Submodule.update()`Sebastian Thiel2015-01-201-2/+5
| | | | Fixes #50
* Submodule.parent_commit() now automatically points to repo.head unless it ↵Sebastian Thiel2015-01-201-6/+4
| | | | | | | | was set before. That way, you don't always have to keep the parent commit uptodate when changing the repo, which can lead to errors which are hard to debug and make no sense to the user, who previously never set parent_commit (yet it matters thanks to the cache).
* Greatly improved possible safety of Submodule.update(), which is used by ↵Sebastian Thiel2015-01-201-30/+83
| | | | | | | | | | | | default. Previously, the implementation would gladly reset new commits in submodules, and/or reset a dirty working tree. Now the new force_reset/force flag has to be specified explicitly to get back to the old behaviour. All submodule tests except for one are working.
* Submodule.move() will auto-rename the submodule if the name was equal to the ↵Sebastian Thiel2015-01-191-1/+4
| | | | | | path Fixes #238
* Implemented Submodule.rename()Sebastian Thiel2015-01-191-0/+23
| | | | | | A test verifies it's truly working. Related to #238
* Submodule.move() fixed to deal with 'non-gitfile' clones appropriately.Sebastian Thiel2015-01-191-4/+14
| | | | | | | Improved a test to assure multiple update(init=False|True) calls don't throw. Fixes #93
* Basic submodule tests are working once again !Sebastian Thiel2015-01-191-11/+15
| | | | | | | | After all, it was easier than expected. It seems that previous assertions the test made should have never been true to begin with. Thus we might have improved the test thanks to our improved implementation. Fixes #233
* Submodule.remove() now seems to work properly, nearly all tests are back.Sebastian Thiel2015-01-171-4/+13
| | | | | | This also means that now we seem to be able to properly handle .git files in submodules Related to #233
* Made sure dry-run is properly implemented in Submodule.remove()Sebastian Thiel2015-01-171-4/+7
| | | | | The root-submodule test is still failing though, this time even earlier than before
* Submodule.remove() now deals with .git files correctly.Sebastian Thiel2015-01-171-4/+6
| | | | A simple test verifies this at least.
* Assured Submodule.(update|move) are dealing with .git files appropriately.Sebastian Thiel2015-01-171-0/+14
| | | | | However, a simple test-case still fails for reasons not yet understood. There is more to be fixed here - .remove() still fails.
* Implemented more tests and made use of .git files when adding submodulesSebastian Thiel2015-01-161-3/+45
| | | | | | | There is some more work to do, as renames and updates still have to be adjusted accordinlgy. Relates #233
* Fixed previously failing testSebastian Thiel2015-01-151-2/+3
| | | | | | It actually revealed a bug in the implementation of Submodule.add, which just showed in python 3 for the wrong reasons. Thankfully, failing tests after all allowed to get this issue fixed ... .
* Verified that it apparently is impossible to add empty submodules using ↵Sebastian Thiel2015-01-151-4/+20
| | | | | | | | | | | | | | | | | | | git-python. This is the case with `git submodule add` as well. This makes sense as an empty git repository doesn't have a commit, which needs to be specified as SHA in the parent repositories tree entry for the respective submodule. When manually adding the empty submodule to the .gitmodules file, git-python will throw another error related to the inability to find the submodule in the index. Even if an iteration would be possible, git-python would now throw a BadName exception, which clearly indicates that the 'HEAD' revision is invalid (as it doesn't point to any commit). Fixes #152 Fixes #105
* Submodule.add() can now handle absolute module paths in agreement to the doc ↵Sebastian Thiel2015-01-151-3/+11
| | | | | | | | | | string. Previously, it would say it can handle absolute module paths, but didn't actually do so. A test-case was improved to check for this case. Fixes #161
* Added the first submodule will no longer cause an IOError.Sebastian Thiel2015-01-151-0/+7
| | | | | | This is verified by the respective test. Fixes #117
* test_submodule worksSebastian Thiel2015-01-061-1/+1
|
View Lorry Controller Status