-
Notifications
You must be signed in to change notification settings - Fork 109
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
TST: annexrepo: Update test for "no commits" sub-repo fix in Git #3493
Conversation
Note this is doing some ugly things to the upstream git setup because of unresolved issues with running the upstream git build on Xenial rather than Trusty.
A Git v2.22.0 build (with this PR and gh-3492) is set up at: https://travis-ci.org/datalad/datalad/builds/550858203 |
The updated test fails in the 2.22.0 Travis build. I'm afraid this is due to the same issue I haven't figured out in gh-3476. When I run it locally, both Git 2.21.0 and 2.22.0 behave as expected. For 2.22.0, this means that "submod/" is included in the untracked files, the same result that the azure build posted in gh-3490 shows. So my local tests and conda's azure tests agree. There seems to be something wonky with the upstream Git setup on Travis. |
Or, somehow the bundled Git is getting used despite setting failure
|
615e1dd
to
c4bb132
Compare
Or, somehow the bundled Git is getting used despite setting `DATALAD_USE_DEFAULT_GIT=1`.
In the case of test_AnnexRepo_status, the bundled git was being accessed through `git annex status`. I've worked around this by adding an entry for the bundled git to external_versions, and then having the test look at that to decide what status output it expects.
The test run with the upstream Git is now green (aside from the ls_webui
error fixed by gh-3492), so I'll drop c4bb132.
https://travis-ci.org/datalad/datalad/builds/550960613
|
c4bb132
to
ff2bc90
Compare
The appveyor failures are the familiar |
We'll use this to add the bundle git version to external_versions.
Even when DATALAD_USE_DEFAULT_GIT is set, there are some commands that will use the bundled Git (e.g., "git annex status"). In these cases, inspecting cmd:git isn't relevant, and we need a way to check the bundled version.
As of Git 2.22.0, specifically b22827045e (dir: do not traverse repositories with no commits, 2019-04-09), 'git ls-files' now treats a repository on an unborn branch as a repository rather than a directory. Fixes datalad#3490.
ff2bc90
to
1cd955d
Compare
Codecov Report
@@ Coverage Diff @@
## 0.11.x #3493 +/- ##
=========================================
Coverage ? 77.41%
=========================================
Files ? 252
Lines ? 33507
Branches ? 0
=========================================
Hits ? 25941
Misses ? 7566
Partials ? 0
Continue to review full report at Codecov.
|
1 similar comment
Codecov Report
@@ Coverage Diff @@
## 0.11.x #3493 +/- ##
=========================================
Coverage ? 77.41%
=========================================
Files ? 252
Lines ? 33507
Branches ? 0
=========================================
Hits ? 25941
Misses ? 7566
Partials ? 0
Continue to review full report at Codecov.
|
Test with upstream Git looks good. AppVeyor failure is due to test_install.test_datasets_datalad_org. Will merge, dropping the last commit. |
0.11.6 (Jul 30, 2019) -- am I the last of 0.11.x? Primarily bug fixes to achieve more robust performance Fixes - Our tests needed various adjustments to keep up with upstream changes in Travis and Git. ([#3479][]) ([#3492][]) ([#3493][]) - `AnnexRepo.is_special_annex_remote` was too selective in what it considered to be a special remote. ([#3499][]) - We now provide information about unexpected output when git-annex is called with `--json`. ([#3516][]) - Exception logging in the `__del__` method of `GitRepo` and `AnnexRepo` no longer fails if the names it needs are no longer bound. ([#3527][]) - [addurls][] botched the construction of subdataset paths that were more than two levels deep and failed to create datasets in a reliable, breadth-first order. ([#3561][]) - Cloning a `type=git` special remote showed a spurious warning about the remote not being enabled. ([#3547][]) Enhancements and new features - For calls to git and git-annex, we disable automatic garbage collection due to past issues with GitPython's state becoming stale, but doing so results in a larger .git/objects/ directory that isn't cleaned up until garbage collection is triggered outside of DataLad. Tests with the latest GitPython didn't reveal any state issues, so we've re-enabled automatic garbage collection. ([#3458][]) - [rerun][] learned an `--explicit` flag, which it relays to its calls to [run][[]]. This makes it possible to call `rerun` in a dirty working tree ([#3498][]). - The [metadata][] command aborts earlier if a metadata extractor is unavailable. ([#3525][]) * tag '0.11.6': (56 commits) [DATALAD RUNCMD] make update-changelog finalize CHANGELOG.md entry and boost version BF(DOC): close [create] with [] to not cause WARNING by md-strict pandoc CHANGELOG.md: Link entry from b3e8adb CHANGELOG.md: Add entry for gh-3547 CHANGELOG.md: Add entry for gh-3561 CHANGELOG.md: Add link for addurls RF: inform about special remotes based on autoenable config CHANGELOG.md: Second batch for 0.11.6 BF: addurls: Process datasets in a stable, breadth-first order BF: addurls: Fix construction of nested subpaths TST: addurls: Don't hard-code path separator BF(TST): skip test_v7_detached_get in direct mode - fails to annex upgrade TST: benchmark-travis-pr: Swap 'pip install' and 'git show' TST: benchmark-travis-pr: Move repeated logic to run_asv() TST: benchmark-travis-pr: Support other bases TST: benchmark-travis-pr: Tweak message about current HEAD TST: benchmark-travis-pr: Simplify two git commands into one TST: benchmark-travis-pr: Reorder and break up lines TST: benchmark-travis-pr: Move command for running asv into function ...
As of Git 2.22.0, specifically b22827045e (dir: do not traverse
repositories with no commits, 2019-04-09), 'git ls-files' now treats a
repository on an unborn branch as a repository rather than a
directory.
Fixes #3490.