00:43:51 I am finishing up a last "0.25 update" post with the tournament announcement, so anyone speak up if you need something special mentioned. 00:53:38 is that going to lock in the 5th as the tournament date? I think it should be announced around now so people have a week to prepare 00:56:47 -!- amalloy_ is now known as amalloy 00:56:57 latest progress on rules page: https://imgur.com/a/Geu2h2S 00:57:33 I've updated the colours, and converted individual categories to a new visual style 01:46:38 RE: tourney clan scoring, I dont think adding a player to your clan should ever be able to decrease your score 01:46:57 which isn't true with the 12/(clan size) limit 01:47:04 for wins category 01:48:01 I would just put a limit of 4 per player and 12 overall 01:48:22 so clans of <3 are penalised but 1 or 2 people is hardly a clan anyway 03:13:59 Last 0.25 update and tournament/release date announcement http://crawl.develz.org/wordpress/last-0-25-updates-and-releasetournament-date 03:16:23 03gammafunk02 07* 0.26-a0-30-g56b8cd3: Update the changelog 10(45 seconds ago, 1 file, 14+ 9-) 13https://github.com/crawl/crawl/commit/56b8cd3df03d 03:17:01 03gammafunk02 07[stone_soup-0.25] * 0.25-b1-23-ge2ad7d5: Update the changelog 10(83 seconds ago, 1 file, 14+ 9-) 13https://github.com/crawl/crawl/commit/e2ad7d536cfc 03:32:01 Unstable branch on crawl.kelbi.org updated to: 0.26-a0-30-g56b8cd3df0 (34) 03:47:43 Fork (bcrawl) on crawl.kelbi.org updated to: 0.23-a0-3152-gcf7fa35852 03:49:09 Fork (bcadrencrawl) on crawl.kelbi.org updated to: 0.22.1-2749-gb5e28fc70b 05:51:30 -!- amalloy is now known as amalloy_ 06:03:42 -!- amalloy_ is now known as amalloy 06:31:00 -!- amalloy is now known as amalloy_ 07:40:35 03Elliot Dronebarger02 07https://github.com/crawl/crawl/pull/1427 * 0.26-a0-38-g238d9d0: Merge branch 'master' of ../crawl into monster_habitat 10(6 minutes ago, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/238d9d0635b3 10:52:20 aidanh_: I'll make the changes you mentioned - do we want to do the tests under a different PR? 10:53:51 elliotd123: tests for new code should go in the same commit that the code goes in 10:54:10 so same PR is best; then we can squash all commits in the PR together once it's ready to merge 10:57:53 I don't know much about the test framework for crawl yet - Do you know if there's an example of a similar test that I can check out? 10:59:27 !source catch2-tests/test_mon-util.cc:11 10:59:32 https://github.com/crawl/crawl/blob/master/crawl-ref/source/catch2-tests/test_mon-util.cc#L11 11:00:08 elliotd123: ^ there's one 11:00:41 the structure for testing mons_habitat_type() should be basically the same 11:01:17 there'll be an outer TEST_CASE() block: "mons_habitat_type() returns correct values" 11:01:53 inside, you may or may not need the init_monsters() call; then after that, one SECTION for each different type of monster / zombie 11:02:12 I might suggest that it's pretty tricky for new contributors to figure out how to interact with catch2 11:02:21 *I* don't even know how to, and afaik it's not documented 11:03:19 well, 11:04:00 for this particular case, it should be relatively straight forward; the function accepts two enums and returns an enum 11:04:12 i certainly wouldn't suggest it if it required crazy mocking or anything 11:04:13 I'm sure catch2 is documented, but nothing about how it interacts with crawlcode are or what expectations there are for writing tests 11:05:57 interaction with crawlcode is reasonably straight-forward: crawl's .o files are linked together with catch2's main, and catch2 does some horrible macro-based test discovery 11:06:14 so tests should do their best to avoid fiddling with global state 11:06:37 can I run the catch2 tests locally? 11:07:13 as for expectations, i'd like to think "whenever possible", but i suspect the answer will be "only if it doesn't hurt too much" 11:07:18 elliotd123: sure can 11:07:39 make catch2-tests 11:07:50 i'm not sure if that needs to be `make debug-lite catch2-tests` 11:08:12 my full invocation is `make -j8 FORCE_CC=clang FORCE_CXX=clang++ debug-lite TILES=y catch2-tests` 11:11:09 may actually be helpful to add some of this to https://github.com/crawl/crawl/blob/master/crawl-ref/docs/develop/testing.md 11:13:01 wow, we have docs 11:13:47 yeah, looks like alexjurkiewicz added these 11:14:19 I was taking a break then so I didn't notice until now 11:14:21 documenting how catch2 unit tests work sounds like a good idea; to this day i don't know (and don't want to know) how the lua tests work 11:16:31 one really annoying thing about unit test coverage is that there appears to be no way to exclude sections of code from coverage with e.g. begin/end comments 11:23:15 alexjurkiewicz curious why you described the lua tests as "functional testing", I would have called most of it regression testing 11:24:14 aidanh I think most of the lua testing is a lot closer to what you are doing in catch2 than you maybe think 11:24:37 there's a bunch of stress testing in there which I haven't seen in catch2 though 11:27:06 could also be called "end-to-end testing" :) 11:33:54 there i go 11:34:16 * aidanh wonders what on earth my bouncer is doing 11:58:58 aidanh: got some tests working, so thanks for the help/feedback 11:59:19 Just need to write tests for describe.cc 11:59:44 fun way to memorize a spell that's not in your library: disable book pickup, stand over a book, xv, and memorize from spell description 11:59:49 that should probably be removed 12:00:32 elliotd123: great! for describe.cc, you'll need to add a new test file, and add a corresponding entry for the test file in Makefile.obj 12:00:38 let me know if you run into issues with that 12:01:02 Only thing I can think of is that I'm not sure the correct way to create a new monster 12:03:12 -!- jfcaron_ is now known as jfcaron 12:03:34 ah, good question 12:04:11 Just to make sure I properly build the monster_info struct for the monsters 12:04:45 otherwise I guess I could just create a bare monster_info struct and set only the type and base_type, since I think that's all I use in that new function 12:04:54 i think that would be sufficient 12:05:03 <|amethyst> monster_info has a constructor that takes a type and base type 12:05:18 <|amethyst> monster_info mi(MONS_SKELETON, MONS_SNAPPING_TURTLE); 12:05:33 perfect 12:05:44 oh nice thanks 12:07:22 oh _describe_monster_habitat is a local function in describe.cc - seems like catch2 might not be able to access it for testing? Do I need to add a declaration in describe.h? 12:08:23 !source randbook.h:64 12:08:24 https://github.com/crawl/crawl/blob/master/crawl-ref/source/randbook.h#L64 12:08:32 or just in the test? 12:08:39 yep; please make it non-static, and add a comment like that 12:08:58 when does the tournament start? 12:10:32 <|amethyst> hmm 12:11:06 <|amethyst> I feel like it might be better to test that the result of get_monster_db_desc includes the text about amphibiousness 12:15:10 it'd probably make sense to test that as well 12:16:12 03Aidan Holm02 07* 0.26-a0-31-gc29e872: Remove ability to memorize spells from their description 10(6 minutes ago, 1 file, 3+ 37-) 13https://github.com/crawl/crawl/commit/c29e87230767 12:32:22 Unstable branch on crawl.kelbi.org updated to: 0.26-a0-31-gc29e872307 (34) 12:46:09 floraline: Jun 5 12:46:38 stone_soup-0.25 is tagged if you want to set it up 13:18:46 Unstable branch on crawl.akrasiac.org updated to: 0.26-a0-31-gc29e872 (34) 13:22:27 -!- aidanh_ is now known as aidanh 14:08:53 For some reason on the catch2 test I'm always getting HT_AMPHIBIOUS, even with other monster types, but it works in game with the same values... 14:09:58 have you tried using a debugger? you can run ./catch2-tests-executable to run tests directly 14:10:25 yep 14:10:47 it's possible you need a init_monsters(); call 14:11:25 Ah I'll try the init_monsters call 14:12:11 that did the trick 14:12:54 I'll push what I've got - I didn't create a test for get_monster_db_desc 14:18:02 great 14:22:42 03Elliot Dronebarger02 07https://github.com/crawl/crawl/pull/1427 * 0.26-a0-39-ge8f477c: Added tests 10(7 minutes ago, 7 files, 140+ 16-) 13https://github.com/crawl/crawl/commit/e8f477cd76a0 14:22:42 03Elliot Dronebarger02 07https://github.com/crawl/crawl/pull/1427 * 0.26-a0-40-gece1f79: The linter always gets me 10(3 minutes ago, 1 file, 1+ 19-) 13https://github.com/crawl/crawl/commit/ece1f79024fc 14:24:54 you can run the linter locally: util/checkwhite && util/unbrace 14:25:03 I even ran the checkwhite linter before I pushed, but I guess it doesn't check the test files 14:25:27 yeah I ran both of those, just missed the test files - do those linters just run on cwd? 14:25:51 they should run on everything; the CI runs those scripts 14:26:07 hmmm... 14:26:37 Yeah they do 14:26:41 I don't know what I did wrong 14:31:28 no worries, happens to all of us sometimes 14:55:37 New branch created: pull/1431 (1 commit) 13https://github.com/crawl/crawl/pull/1431 14:55:37 03Nikolai Lavsky02 07https://github.com/crawl/crawl/pull/1431 * 0.26-a0-32-g777ef56: Fix description of amulets of reflection 10(11 minutes ago, 1 file, 7+ 7-) 13https://github.com/crawl/crawl/commit/777ef5689862 14:55:49 gammafunk fyi I'm attempting to update the cao configs for 0.25, you may need to double check this when I'm done 14:55:56 this is an extremely un-automated process 14:56:12 so many little files to change 14:56:14 advil: thanks, can take a look later 14:56:26 yeah, certainly is 14:57:38 -!- amalloy_ is now known as amalloy 14:58:14 do you know if there's a list of all the files to update when adding a new version in dgamelaunch-config? 14:58:40 at some point we should get this resynced with crawl/dgamelaunch-config, that might at least make it easier 15:09:55 <|amethyst> advil: https://crawl.develz.org/wiki/doku.php?id=dcss:server:maintaining_dgamelaunch_and_webtiles 15:23:12 Stable (0.25) branch on crawl.akrasiac.org updated to: 0.25-b1-23-ge2ad7d5 15:27:13 03advil02 07* 0.26-a0-32-gc8e6c4a: Fix a signed/unsigned warning 10(3 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/c8e6c4a4156a 15:27:24 New branch created: pull/1432 (1 commit) 13https://github.com/crawl/crawl/pull/1432 15:27:24 03Nikolai Lavsky02 07https://github.com/crawl/crawl/pull/1432 * 0.26-a0-32-g2246e31: Don't pick up duplicate tins of tremorstones 10(22 minutes ago, 1 file, 1+ 0-) 13https://github.com/crawl/crawl/commit/2246e3195b11 15:33:05 Unstable branch on crawl.kelbi.org updated to: 0.26-a0-32-gc8e6c4a415 (34) 16:16:46 03Elliot Dronebarger02 07https://github.com/crawl/crawl/pull/1427 * 0.26-a0-41-g44e27ec: typo fix 10(2 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/44e27ecaa763 16:42:25 -!- amalloy is now known as amalloy_ 16:56:40 advil: functional testing seemed like it was non-specific enough to cover everything lua testing does. I am not a big fan of "regression testing" in that it equally describes the unit tests 17:00:20 "Cloak of Preservation - I got this in a recent game, and found the item description confusing. It says something about "partial" acid or corrosion resistance. I think the description for rCorr normally doesn't say "partial," so I was a bit confused as to whether the cloak was providing a lower amount of rCorr. " some feedback 17:00:22 https://www.reddit.com/r/dcss/comments/gs8b01/last_025_updates_and_releasetournament_date/fs3vvj9/ 17:15:18 well, unit tests I would also call regression testing 17:15:31 in many cases 17:38:48 03advil02 07* 0.26-a0-33-gae26e8c: Temporary check to bridge a change in client.js 10(5 minutes ago, 1 file, 3+ 1-) 13https://github.com/crawl/crawl/commit/ae26e8c9cb12 17:42:42 Unstable branch on crawl.akrasiac.org updated to: 0.26-a0-33-gae26e8c (34) 17:43:37 apparently changing client.js is a bad idea is what I have learned 17:44:40 though I don't think this browser cache issue happened on other servers, not sure why 17:44:59 I guess I tested on CKO which IIRC has a reverse proxy, maybe that dealt with it 17:47:25 Unstable branch on crawl.kelbi.org updated to: 0.26-a0-33-gae26e8c9cb (34) 17:49:21 03advil02 07* 0.26-a0-34-g9e0bf03: Fix an unused param warning 10(25 seconds ago, 1 file, 4+ 5-) 13https://github.com/crawl/crawl/commit/9e0bf0358992 18:02:35 Unstable branch on crawl.kelbi.org updated to: 0.26-a0-34-g9e0bf03589 (34) 18:12:53 is ae26e8c9cb126a346f4d7f687da94dda7e87125b related to how i've usually needed to refresh the play-dcss-git page once or twice lately? 18:23:13 Unstable branch on underhound.eu updated to: 0.26-a0-34-g9e0bf03589 (34) 18:29:17 cebolla if you're playing on CAO maybe 18:29:23 though it shouldn't have taken more than one refresh 18:30:12 ah ok. i play on kelbi, and i usually go directly to the #play or #watch url, and refreshing seems to be more effective than waiting for the splash screen to go away. mb confirmation bias and all that 18:47:02 what is it that is happening if you don't refresh? 19:08:40 advil: thanks, i have some housekeeping i want to get done before then 19:10:17 it looks like the new webtiles changes will work without any manual steps, i don't think i'll be updating tornado yet 19:12:54 i'll wait to do that until i upgrade to debian 10 which offers tornado 5 19:19:02 are you also on patched tornado 2.4? 19:23:10 actually no, i thought i was but it looks like i'm not 19:23:35 i'm on 2.4.1 with one of my own small changes: https://github.com/floraline/tornado/tree/2.4.1 19:24:20 i don't have that http timeouts patch 19:28:44 are we safe to use tornado 5 with no special patches? 19:29:10 and the python3 version too? 19:34:45 advil: the splash screen stays up for a long time. perhaps indefinitely? not sure. but many times i've gone "eh, i'll try a refresh" after what feels like a long time, and then bang, it loads 19:35:05 right now it's loading just fine, i'll let ya know if i can get it to behave badly again 20:13:52 cebolla cko updates a lot, so if you load on cko right after an update it may need to regenerate the maps, which will take some time at the splash screen 20:15:33 floraline should be fine to use, though python 3 is less tested on live servers (cpo is running python 3 + tornado 6 I believe) 20:18:42 based on general knowledge I'd probably recommend tornado 6 over 5 if you're going to python 3 20:18:53 but I don't know if there's any practical consequences 20:27:22 you'd need to use tornado 5 with python 3.4 or older. I Ubuntu 16.04 LTS and debian squeeze(?) had that py version 20:27:43 ah true 20:34:43 -!- Amnesiac_ is now known as Amnesiac 21:08:55 advil: did you need me to look over CAO setup, or are you ok with that now? All I'd be doing is going back through the dgl instructions neil linked to verify, but I'm happy to do so if that's helpful 21:14:27 I think I did everything 21:23:07 well, I have not yet restarted webtiles server 21:23:44 but things seem to be working ok in console, and I even figured out how to update the relevant crontab 21:25:27 hm maybe there's some steps with logfiles I need to do still 21:49:13 !version 21:49:14 trunk: not found; 0.19: not found; 0.18: not found; 0.17: not found; 0.16: not found; 0.15: not found; 0.14: not found; 0.13: not found; 0.12: not found; 0.11: not found; 0.10: 0.10.3-19-g6f05415 21:49:19 hm 21:53:51 !version 21:53:52 latest: 0.26-a0-33-gae26e8c; 0.25: 0.25-b1-23-ge2ad7d5; 0.24: 0.24.1-14-gf8d2b50; 0.23: 0.23.3-3-gaaff5ab; 0.22: 0.22.3-3-g34f245f; 0.21: 0.21.3-3-g218456f; 0.20: 0.20.2-3-g29329e0; 0.19: 0.19.6-3-g7d5932f; 0.18: 0.18.2-3-g5ac21b8; 0.17: 0.17.3; 0.16: 0.16.3-4-gc506b73; 0.15: 0.15.3-3-g8e88d0d; 0.14: 0.14.3-3-g02348ce; 0.13: 0.13.3-3-g4e9f7b7; 0.12: 0.12.4-3-g8567966; 0.11: 0.11.4-3-g4668e67; 0.10: 0... 21:55:32 -!- amalloy_ is now known as amalloy 21:55:38 ok, now I *really* think I've done everything 21:56:41 except "Restart crawl-inotify-dglwhere", I don't know what that is 22:00:22 https://crawl.develz.org/wiki/doku.php?id=dcss:server:setting_up_dgamelaunch_and_webtiles#other_notes 13.6 ? 22:01:00 possibly not running on cao 22:01:33 It is if games are watched on console, afaik 22:02:22 It's started at boot time here 22:02:29 what is the process called? 22:03:00 ein moment 22:03:19 if it has the string 'notify' in it it's not running, I can tell you that much 22:03:43 crawl 1947 0.0 0.2 6296 2216 ? Ss Feb18 1:31 perl /scratch/crawl-dev/dgamelaunch-config/bin/crawl-inotify-dglwhere.pl /scratch/crawl/DGL/dgldir /scratch/crawl/DGL/dgldir/morgue 22:04:45 thanks 22:04:53 no idea if it's intended to be running but it's definitely not 22:05:22 Well, if I ssh to CAO and watch games, the "Where" field is unpopulated. 22:05:46 That seems consistent with " Launch the inotify watcher which is necessary to populate the “current location” field in DGL." 22:08:05 03advil02 07[stone_soup-0.17] * 0.17.3-4-g93a25c6: Fix some accidental merge markers 10(47 seconds ago, 1 file, 0+ 4-) 13https://github.com/crawl/crawl/commit/93a25c67f478 22:16:08 The build has errored. (stone_soup-0.17 - 93a25c6 #13522 : advil): https://travis-ci.org/crawl/crawl/builds/692400408 22:23:48 Stable (0.17) branch on crawl.akrasiac.org updated to: 0.17.3-4-g93a25c6 22:34:22 advil: hrm, should I see 0.25 on the webtiles lobby, then? or are you still waiting before restart 22:34:50 I do see it in console 22:36:30 I haven't done the webtiles restart 22:36:44 lately when doing that I've been trying to give players some warning 22:36:49 gotcha 22:37:06 interestingly, when I start my game under 0.25 console, webtiles labels it as trunk 22:37:21 huh, odd 22:37:23 which I guess makes sense, since it has no configuration for 0.25 22:37:38 but I checked, and it is the 0.25-b1 version 22:37:41 yeah, I wonder why it chose trunk though 22:37:49 first game defined maybe? 23:08:48 <|amethyst> yeah, it looks like that's what find_game_info() in process_handler.py is doing if the game_id from the socket filename isn't in the config 23:09:47 <|amethyst> advil: also, I noticed the "v" and "V" commands in the crawl-0.25 menu still refer to the 0.24 changelogs 23:10:59 <|amethyst> specifically, if the game_id from the socket filename isn't listed in the webtiles config, it takes the first game_id that has the same socket_path 23:11:39 <|amethyst> and since we use the socket_path for everything (because why wouldn't you) that ends up being the first game in the config 23:56:37 I just did something crazy and updated http://crawl.akrasiac.org/