Merge 'mapbox-gl-test-suite' repo without preserving git history #3834

lucaswoj · 2016-12-19T23:53:22Z

This PR merges mapbox-gl-test-suite into this repo. We do not preserve git history to reduce repo size. We introduce git-lfs to reduce repo size.

The merge is pretty naive, dropping mapbox-gl-test-suite into a test/integration folder unmodified. More extensive merging of fixture libraries and code is planned for a future PR.

fixes #3795

jfirebaugh · 2016-12-20T00:11:15Z

Getting some errors when trying to use this in mapbox-gl-native:

~/Development/mapbox-gl-native $ npm install
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: Downloading test/fixtures/mbsv5-6-18-23.vector.pbf (71.19 KB)
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: Error downloading object: test/fixtures/mbsv5-6-18-23.vector.pbf (d1b2db99907dbfd9747dc88e8ef5b91974b21222f6dde73f5507bec7e957545b)
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: 
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: Errors logged to /private/var/folders/vp/d4cnkmkx3pz5tj36vw4g5hbr0000gn/T/npm-84441-263c2371/git-cache-723ed10f/e68e3a6d5035d77f21dc15256369866cac7bfeab/.git/lfs/objects/logs/20161219T160701.103130306.log
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: Use `git lfs logs last` to view the log.
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: error: external filter git-lfs smudge %f failed 2
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: error: external filter git-lfs smudge %f failed
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: fatal: test/fixtures/mbsv5-6-18-23.vector.pbf: smudge filter lfs failed
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: 
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: Downloading test/fixtures/mbsv5-6-18-23.vector.pbf (71.19 KB)
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: Error downloading object: test/fixtures/mbsv5-6-18-23.vector.pbf (d1b2db99907dbfd9747dc88e8ef5b91974b21222f6dde73f5507bec7e957545b)
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: 
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: Errors logged to /private/var/folders/vp/d4cnkmkx3pz5tj36vw4g5hbr0000gn/T/npm-84441-263c2371/git-cache-99b6f612/e68e3a6d5035d77f21dc15256369866cac7bfeab/.git/lfs/objects/logs/20161219T160808.428575012.log
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: Use `git lfs logs last` to view the log.
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: error: external filter git-lfs smudge %f failed 2
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: error: external filter git-lfs smudge %f failed
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: fatal: test/fixtures/mbsv5-6-18-23.vector.pbf: smudge filter lfs failed
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: 
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: Downloading test/fixtures/mbsv5-6-18-23.vector.pbf (71.19 KB)
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: Error downloading object: test/fixtures/mbsv5-6-18-23.vector.pbf (d1b2db99907dbfd9747dc88e8ef5b91974b21222f6dde73f5507bec7e957545b)
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: 
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: Errors logged to /private/var/folders/vp/d4cnkmkx3pz5tj36vw4g5hbr0000gn/T/npm-84441-263c2371/git-cache-9e6dd10d/e68e3a6d5035d77f21dc15256369866cac7bfeab/.git/lfs/objects/logs/20161219T160908.323343201.log
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: Use `git lfs logs last` to view the log.
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: error: external filter git-lfs smudge %f failed 2
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: error: external filter git-lfs smudge %f failed
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: fatal: test/fixtures/mbsv5-6-18-23.vector.pbf: smudge filter lfs failed
npm ERR! git checkout e68e3a6d5035d77f21dc15256369866cac7bfeab: 
npm ERR! Darwin 15.6.0
npm ERR! argv "/usr/local/Cellar/node@6/6.9.1/bin/node" "/usr/local/bin/npm" "install"
npm ERR! node v6.9.1
npm ERR! npm  v3.10.8
npm ERR! code 128

lucaswoj · 2016-12-20T00:13:35Z

I have a couple theories about the errors you're seeing. They could be caused by:

not having git-lfs installed on your machine
npm not playing nice with git lfs
me force pushing a few small fixes to this PR
me configuring git lfs incorrectly

EDIT I'm seeing some odd things on CI too https://circleci.com/gh/mapbox/mapbox-gl-js/6368

lucaswoj · 2016-12-20T00:52:53Z

@jfirebaugh pointed out some bugs when using lfs with npm & yarn

lucaswoj · 2016-12-20T17:58:34Z

I think I've found workable solutions to the CI and npm install challenges. Can you try again @jfirebaugh?

lucaswoj · 2016-12-20T18:09:23Z

Word of caution: opening this PR's "Files changed" tab on github crashes Chrome 😬

jfirebaugh · 2016-12-20T20:09:55Z

Can you remove the actual.pngs? They shouldn't be checked in.

lucaswoj · 2016-12-20T21:09:50Z

Good catch @jfirebaugh. It looks like I updated .gitignore after adding the files to git. Fixed in the latest commit. (there were some diff.pngs and index.htmls checked in too). This should be a boon to check out time.

jfirebaugh · 2016-12-21T00:10:25Z

In my tests, git lfs is slower than our current mapbox-gl-test-suite setup on the cases where we currently suffer: fresh clones.

With git 2.11.0 and git-lfs 1.5.3, the initial checkout of this branch took 21m46.766s. It's true that git lfs caches the downloaded files, but this is a cost that anyone cloning the repository for the first time will have to pay. That includes installation of a git npm dependency, which does git clone --mirror.

In mapbox-gl-native, after removing the mapbox-gl-test-suite dependency and updating the mapbox-gl dependency to point at 68feb9c, a fresh npm install took a similar amount of time -- 22m53.584s. A non-fresh npm install after bumping the SHA of the mapbox-gl dev dependency from 68feb9c to 65a49c3 (a noop commit) took 17m56.164s. For comparison, equivalent operations with the current setup take about 14m.

TL;DR, with npm, any time a git dependency changes, it's a fresh git clone, and that's slower with git lfs than cloning the entire history of mapbox-gl-test-suite. It doesn't seem like this workload is a good fit for git lfs.

lucaswoj · 2016-12-21T14:09:22Z

I agree. I'll strip out lfs in a subsequent commit.

cc @mourner

lucaswoj · 2016-12-21T17:47:21Z

Ready to 🚢?

jfirebaugh · 2016-12-21T17:59:20Z

Hold on this one please. I need to make sure it integrates cleanly into mapbox-gl-native.

lucaswoj · 2016-12-21T18:11:08Z

No problem 👍. Any idea how adding expected.png files and fixtures to .npmignore would effect GL Native?

jfirebaugh · 2016-12-21T18:17:29Z

It looks like that'll be an issue actually -- after installing as a dev dependency in GL native, node_modules/mapbox-gl doesn't have a test directory at all.

jfirebaugh · 2017-01-02T19:24:15Z

Looking promising downstream in gl-native: mapbox/mapbox-gl-native#7531. @lucaswoj could you update the branch here with the latest from test-suite?

Updated to mapbox/mapbox-gl-test-suite@9ab19437e6a5272f1d fd7aaf12a7b5bbec208895

lucaswoj · 2017-01-09T22:54:57Z

Updated to latest test suite SHA @jfirebaugh (mapbox/mapbox-gl-test-suite@9ab1943)

lucaswoj · 2017-01-10T01:11:04Z

Merging per chat with @jfirebaugh 🎉

lucaswoj force-pushed the merge-test-suite branch 2 times, most recently from e3acc7b to 965bce4 Compare December 20, 2016 00:08

lucaswoj added the under development label Dec 20, 2016

lucaswoj force-pushed the merge-test-suite branch 2 times, most recently from 63b509d to 7db48cc Compare December 20, 2016 17:49

lucaswoj removed the under development label Dec 20, 2016

lucaswoj force-pushed the merge-test-suite branch from 4672136 to 68feb9c Compare December 20, 2016 21:09

lucaswoj force-pushed the merge-test-suite branch 3 times, most recently from 597a0a8 to 3f33d6b Compare December 21, 2016 14:35

lucaswoj changed the title ~~Merged 'mapbox-gl-test-suite' repo without preserving git history and adding lfs~~ Merged 'mapbox-gl-test-suite' repo without preserving git history Dec 21, 2016

lucaswoj force-pushed the merge-test-suite branch from 3f33d6b to ec19e32 Compare December 21, 2016 14:39

jfirebaugh mentioned this pull request Dec 21, 2016

Use Git submodules for shaders/test suite mapbox/mapbox-gl-native#5249

Closed

lucaswoj changed the title ~~Merged 'mapbox-gl-test-suite' repo without preserving git history~~ Merge 'mapbox-gl-test-suite' repo without preserving git history Dec 22, 2016

jfirebaugh mentioned this pull request Dec 23, 2016

[build] Use test-suite integration tests from mapbox-gl-js mapbox/mapbox-gl-native#7531

Merged

Merged 'mapbox-gl-test-suite' repo without preserving git history

3d77df1

Lucas Wojciechowski added 2 commits January 9, 2017 14:50

Fix test fixtures

3e6c0f6

Update test suite

0f6b49f

Updated to mapbox/mapbox-gl-test-suite@9ab19437e6a5272f1d fd7aaf12a7b5bbec208895

lucaswoj force-pushed the merge-test-suite branch from 7c84acd to 0f6b49f Compare January 9, 2017 22:54

Lucas Wojciechowski added 2 commits January 9, 2017 16:20

Fix lint errors

bdb738c

Skip failing 'image-add' test

17c2b43

lucaswoj merged commit 8780088 into master Jan 10, 2017

lucaswoj deleted the merge-test-suite branch January 10, 2017 01:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 'mapbox-gl-test-suite' repo without preserving git history #3834

Merge 'mapbox-gl-test-suite' repo without preserving git history #3834

lucaswoj commented Dec 19, 2016 •

edited

Loading

jfirebaugh commented Dec 20, 2016

lucaswoj commented Dec 20, 2016 •

edited

Loading

lucaswoj commented Dec 20, 2016

lucaswoj commented Dec 20, 2016

lucaswoj commented Dec 20, 2016

jfirebaugh commented Dec 20, 2016

lucaswoj commented Dec 20, 2016 •

edited

Loading

jfirebaugh commented Dec 21, 2016

lucaswoj commented Dec 21, 2016

lucaswoj commented Dec 21, 2016

jfirebaugh commented Dec 21, 2016

lucaswoj commented Dec 21, 2016

jfirebaugh commented Dec 21, 2016

jfirebaugh commented Jan 2, 2017 •

edited

Loading

lucaswoj commented Jan 9, 2017

lucaswoj commented Jan 10, 2017

Merge 'mapbox-gl-test-suite' repo without preserving git history #3834

Merge 'mapbox-gl-test-suite' repo without preserving git history #3834

Conversation

lucaswoj commented Dec 19, 2016 • edited Loading

jfirebaugh commented Dec 20, 2016

lucaswoj commented Dec 20, 2016 • edited Loading

lucaswoj commented Dec 20, 2016

lucaswoj commented Dec 20, 2016

lucaswoj commented Dec 20, 2016

jfirebaugh commented Dec 20, 2016

lucaswoj commented Dec 20, 2016 • edited Loading

jfirebaugh commented Dec 21, 2016

lucaswoj commented Dec 21, 2016

lucaswoj commented Dec 21, 2016

jfirebaugh commented Dec 21, 2016

lucaswoj commented Dec 21, 2016

jfirebaugh commented Dec 21, 2016

jfirebaugh commented Jan 2, 2017 • edited Loading

lucaswoj commented Jan 9, 2017

lucaswoj commented Jan 10, 2017

lucaswoj commented Dec 19, 2016 •

edited

Loading

lucaswoj commented Dec 20, 2016 •

edited

Loading

lucaswoj commented Dec 20, 2016 •

edited

Loading

jfirebaugh commented Jan 2, 2017 •

edited

Loading