mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-25 16:05:27 +03:00
Merge branch 'ted/ford-no-pit' (#2322)
* origin/ted/ford-no-pit: pills: update solid http.c: revert timeout to original ~m10 tests: prime ford %reef cache http.c: bump timeout from ~m20 to ~m30 http.c: bump timeout from ~m10 to ~m20 tests: fix ford tests for no %reef short-circuit ford: remove pit short-circuit
This commit is contained in:
Jared Tobin
commit
bd2d90440f
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:5838a1f03644fb1c53e14a2c8b4726649036bcb131138a82331096062bae3ac1
|
oid sha256:684effe62df5848c6af7d148ca7d2e88ede02d534f1e30fa255e11bfbc12c4e1
|
||||||
size 9649825
|
size 9658892
|
||||||
|
|||||||
267
pkg/arvo/lib/test/ford-external.hoon
Normal file
267
pkg/arvo/lib/test/ford-external.hoon
Normal file
@ -0,0 +1,267 @@
|
|||||||
|
/+ *test
|
||||||
|
=, ford
|
||||||
|
|%
|
||||||
|
:: +expect-schematic: assert a +schematic:ford is what we expect
|
||||||
|
::
|
||||||
|
:: Since Ford requests contain types, we can't do simple
|
||||||
|
:: equality checking. This function handles all the different
|
||||||
|
:: kinds of +schematic:ford, dealing with types as necessary.
|
||||||
|
::
|
||||||
|
++ expect-schematic
|
||||||
|
|= [expected=schematic actual=schematic]
|
||||||
|
^- tang
|
||||||
|
::
|
||||||
|
?^ -.expected
|
||||||
|
?. ?=(^ -.actual)
|
||||||
|
[%leaf "expected autocons, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
%+ weld
|
||||||
|
$(expected head.expected, actual head.actual)
|
||||||
|
$(expected tail.expected, actual tail.actual)
|
||||||
|
::
|
||||||
|
?- -.expected
|
||||||
|
%$
|
||||||
|
?. ?=(%$ -.actual)
|
||||||
|
[%leaf "expected %$, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
%+ weld
|
||||||
|
(expect-eq !>(p.literal.expected) !>(p.literal.actual))
|
||||||
|
(expect-eq q.literal.expected q.literal.actual)
|
||||||
|
::
|
||||||
|
%pin
|
||||||
|
::
|
||||||
|
?. ?=(%pin -.actual)
|
||||||
|
[%leaf "expected %pin, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
%+ weld
|
||||||
|
(expect-eq !>(date.expected) !>(date.actual))
|
||||||
|
$(expected schematic.expected, actual schematic.actual)
|
||||||
|
::
|
||||||
|
%alts
|
||||||
|
::
|
||||||
|
?. ?=(%alts -.actual)
|
||||||
|
[%leaf "expected %alts, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
|- ^- tang
|
||||||
|
?~ choices.expected
|
||||||
|
:: make sure there aren't any extra :choices in :actual
|
||||||
|
::
|
||||||
|
?~ choices.actual
|
||||||
|
~
|
||||||
|
[%leaf "actual had more choices than expected"]~
|
||||||
|
:: :expected isn't empty yet; make sure :actual isn't either
|
||||||
|
::
|
||||||
|
?~ choices.actual
|
||||||
|
[%leaf "expected had more choices than actual"]~
|
||||||
|
:: recurse on the first sub-schematic
|
||||||
|
::
|
||||||
|
%+ weld
|
||||||
|
^$(expected i.choices.expected, actual i.choices.actual)
|
||||||
|
$(choices.expected t.choices.expected, choices.actual t.choices.actual)
|
||||||
|
::
|
||||||
|
%bake
|
||||||
|
(expect-eq [schematic-type expected] [schematic-type actual])
|
||||||
|
::
|
||||||
|
%bunt
|
||||||
|
(expect-eq [schematic-type expected] [schematic-type actual])
|
||||||
|
::
|
||||||
|
%call
|
||||||
|
::
|
||||||
|
?. ?=(%call -.actual)
|
||||||
|
[%leaf "expected %call, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
%+ weld
|
||||||
|
$(expected gate.expected, actual gate.actual)
|
||||||
|
$(expected sample.expected, actual sample.actual)
|
||||||
|
::
|
||||||
|
%cast
|
||||||
|
::
|
||||||
|
?. ?=(%cast -.actual)
|
||||||
|
[%leaf "expected %cast, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
;: weld
|
||||||
|
(expect-eq !>(disc.expected) !>(disc.actual))
|
||||||
|
(expect-eq !>(mark.expected) !>(mark.actual))
|
||||||
|
$(expected input.expected, actual input.actual)
|
||||||
|
==
|
||||||
|
::
|
||||||
|
%core
|
||||||
|
(expect-eq [schematic-type expected] [schematic-type actual])
|
||||||
|
::
|
||||||
|
%diff
|
||||||
|
::
|
||||||
|
?. ?=(%diff -.actual)
|
||||||
|
[%leaf "expected %diff, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
;: weld
|
||||||
|
(expect-eq !>(disc.expected) !>(disc.actual))
|
||||||
|
$(expected start.expected, actual start.actual)
|
||||||
|
$(expected end.expected, actual end.actual)
|
||||||
|
==
|
||||||
|
::
|
||||||
|
%dude
|
||||||
|
::
|
||||||
|
?. ?=(%dude -.actual)
|
||||||
|
[%leaf "expected %dude, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
%+ weld
|
||||||
|
(expect-eq !>(error.expected) !>(error.actual))
|
||||||
|
$(expected attempt.expected, actual attempt.actual)
|
||||||
|
::
|
||||||
|
%hood
|
||||||
|
(expect-eq [schematic-type expected] [schematic-type actual])
|
||||||
|
::
|
||||||
|
%join
|
||||||
|
::
|
||||||
|
?. ?=(%join -.actual)
|
||||||
|
[%leaf "expected %join, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
;: weld
|
||||||
|
(expect-eq !>(disc.expected) !>(disc.actual))
|
||||||
|
(expect-eq !>(mark.expected) !>(mark.actual))
|
||||||
|
$(expected first.expected, actual first.actual)
|
||||||
|
$(expected second.expected, actual second.actual)
|
||||||
|
==
|
||||||
|
::
|
||||||
|
%list
|
||||||
|
::
|
||||||
|
?. ?=(%list -.actual)
|
||||||
|
[%leaf "expected %list, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
|- ^- tang
|
||||||
|
?~ schematics.expected
|
||||||
|
:: make sure there aren't any extra :schematics in :actual
|
||||||
|
::
|
||||||
|
?~ schematics.actual
|
||||||
|
~
|
||||||
|
[%leaf "actual had more schematics than expected"]~
|
||||||
|
:: :expected isn't empty yet; make sure :actual isn't either
|
||||||
|
::
|
||||||
|
?~ schematics.actual
|
||||||
|
[%leaf "expected had more schematics than actual"]~
|
||||||
|
::
|
||||||
|
%+ weld
|
||||||
|
^$(expected i.schematics.expected, actual i.schematics.actual)
|
||||||
|
::
|
||||||
|
%_ $
|
||||||
|
schematics.expected t.schematics.expected
|
||||||
|
schematics.actual t.schematics.actual
|
||||||
|
==
|
||||||
|
::
|
||||||
|
%mash
|
||||||
|
::
|
||||||
|
?. ?=(%mash -.actual)
|
||||||
|
[%leaf "expected %mash, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
;: weld
|
||||||
|
(expect-eq !>(disc.expected) !>(disc.actual))
|
||||||
|
(expect-eq !>(mark.expected) !>(mark.actual))
|
||||||
|
(expect-eq !>(disc.first.expected) !>(disc.first.actual))
|
||||||
|
(expect-eq !>(mark.first.expected) !>(mark.first.actual))
|
||||||
|
(expect-eq !>(disc.second.expected) !>(disc.second.actual))
|
||||||
|
(expect-eq !>(mark.second.expected) !>(mark.second.actual))
|
||||||
|
$(expected schematic.first.expected, actual schematic.first.actual)
|
||||||
|
$(expected schematic.second.expected, actual schematic.second.actual)
|
||||||
|
==
|
||||||
|
::
|
||||||
|
%mute
|
||||||
|
::
|
||||||
|
?. ?=(%mute -.actual)
|
||||||
|
[%leaf "expected %mute, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
%+ weld $(expected subject.expected, actual subject.actual)
|
||||||
|
::
|
||||||
|
|- ^- tang
|
||||||
|
?~ mutations.expected
|
||||||
|
:: make sure there aren't any extra :mutations in :actual
|
||||||
|
::
|
||||||
|
?~ mutations.actual
|
||||||
|
~
|
||||||
|
[%leaf "actual had more mutations than expected"]~
|
||||||
|
:: :expected isn't empty yet; make sure :actual isn't either
|
||||||
|
::
|
||||||
|
?~ mutations.actual
|
||||||
|
[%leaf "expected had more mutations than actual"]~
|
||||||
|
::
|
||||||
|
;: weld
|
||||||
|
(expect-eq !>(p.i.mutations.expected) !>(p.i.mutations.actual))
|
||||||
|
^$(expected q.i.mutations.expected, actual q.i.mutations.actual)
|
||||||
|
%_ $
|
||||||
|
mutations.expected t.mutations.expected
|
||||||
|
mutations.actual t.mutations.actual
|
||||||
|
==
|
||||||
|
==
|
||||||
|
::
|
||||||
|
%pact
|
||||||
|
::
|
||||||
|
?. ?=(%pact -.actual)
|
||||||
|
[%leaf "expected %pact, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
;: weld
|
||||||
|
(expect-eq !>(disc.expected) !>(disc.actual))
|
||||||
|
$(expected start.expected, actual start.actual)
|
||||||
|
$(expected diff.expected, actual diff.actual)
|
||||||
|
==
|
||||||
|
::
|
||||||
|
%path
|
||||||
|
(expect-eq [schematic-type expected] [schematic-type actual])
|
||||||
|
::
|
||||||
|
%plan
|
||||||
|
(expect-eq [schematic-type expected] [schematic-type actual])
|
||||||
|
::
|
||||||
|
%reef
|
||||||
|
(expect-eq [schematic-type expected] [schematic-type actual])
|
||||||
|
::
|
||||||
|
%ride
|
||||||
|
::
|
||||||
|
?. ?=(%ride -.actual)
|
||||||
|
[%leaf "expected %ride, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
%+ weld
|
||||||
|
(expect-eq !>(formula.expected) !>(formula.actual))
|
||||||
|
$(expected subject.expected, actual subject.actual)
|
||||||
|
::
|
||||||
|
%same
|
||||||
|
::
|
||||||
|
?. ?=(%same -.actual)
|
||||||
|
[%leaf "expected %same, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
$(expected schematic.expected, actual schematic.actual)
|
||||||
|
::
|
||||||
|
%scry
|
||||||
|
(expect-eq [schematic-type expected] [schematic-type actual])
|
||||||
|
::
|
||||||
|
%slim
|
||||||
|
::
|
||||||
|
?. ?=(%slim -.actual)
|
||||||
|
[%leaf "expected %slim, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
%+ weld
|
||||||
|
(expect-eq !>(formula.expected) !>(formula.actual))
|
||||||
|
::
|
||||||
|
%+ expect-eq
|
||||||
|
!>(`?`%.y)
|
||||||
|
^- vase
|
||||||
|
:- -:!>(*?)
|
||||||
|
^- ?
|
||||||
|
(~(nest ut subject-type.expected) | subject-type.actual)
|
||||||
|
::
|
||||||
|
%slit
|
||||||
|
::
|
||||||
|
?. ?=(%slit -.actual)
|
||||||
|
[%leaf "expected %slit, but got {<-.actual>}"]~
|
||||||
|
::
|
||||||
|
%+ weld
|
||||||
|
(expect-eq gate.expected gate.actual)
|
||||||
|
(expect-eq sample.expected sample.actual)
|
||||||
|
::
|
||||||
|
?(%vale %volt)
|
||||||
|
(expect-eq [schematic-type expected] [schematic-type actual])
|
||||||
|
::
|
||||||
|
%walk
|
||||||
|
(expect-eq [schematic-type expected] [schematic-type actual])
|
||||||
|
==
|
||||||
|
:: +schematic-type: the +type for +schematic:ford
|
||||||
|
::
|
||||||
|
++ schematic-type ^~ `type`-:!>(*schematic:ford)
|
||||||
|
--
|
||||||
@ -1,267 +1,377 @@
|
|||||||
/+ *test
|
/+ *test
|
||||||
|
::
|
||||||
|
/= ford-vane /: /===/sys/vane/ford /!noun/
|
||||||
|
::
|
||||||
|
/= hoon-scry /: /===/sys/hoon /hoon/
|
||||||
|
/= arvo-scry /: /===/sys/arvo /hoon/
|
||||||
|
/= zuse-scry /: /===/sys/zuse /hoon/
|
||||||
|
/= txt-scry /: /===/mar/txt /hoon/
|
||||||
|
/= diff-scry /: /===/mar/txt-diff /hoon/
|
||||||
|
::
|
||||||
|
!:
|
||||||
=, ford
|
=, ford
|
||||||
|
=, format
|
||||||
|
::
|
||||||
|
=/ test-pit=vase !>(..zuse)
|
||||||
|
=/ ford-gate (ford-vane test-pit)
|
||||||
|
:: prime %reef cache in .ford-gate so we don't have to rebuild the kernel
|
||||||
|
::
|
||||||
|
=< ~& %test-reef-priming
|
||||||
|
=/ co (by-clock:contain compiler-cache-key:ford-gate build-result)
|
||||||
|
::
|
||||||
|
=. compiler-cache.state.ax.ford-gate
|
||||||
|
%+ ~(put co compiler-cache.state.ax.ford-gate)
|
||||||
|
[%ride (rain /~nul/home/hoon/hoon/sys hoon-scry) !>(~)]
|
||||||
|
[%success %ride !>(ride)]
|
||||||
|
:: we'd have to build arvo, so don't bother trying to cache it
|
||||||
|
::
|
||||||
|
=. compiler-cache.state.ax.ford-gate
|
||||||
|
%+ ~(put co compiler-cache.state.ax.ford-gate)
|
||||||
|
[%ride (rain /~nul/home/hoon/zuse/sys zuse-scry) !>(..is)]
|
||||||
|
[%success %ride !>(..zuse)]
|
||||||
|
:: run %reef now that we've cached the hard parts
|
||||||
|
::
|
||||||
|
~& %test-reef-loading
|
||||||
|
=. ford-gate
|
||||||
|
=- ?>(?=(~ -<) ->)
|
||||||
|
%: ford-call-with-comparator
|
||||||
|
ford-gate
|
||||||
|
~1234.5.6
|
||||||
|
scry=(scry-with-results (with-reef ~1234.5.6 ~))
|
||||||
|
call-args=[*duct *type %build %.n %reef ~nul %home]
|
||||||
|
^= comparator
|
||||||
|
|= moves=(list move:ford-gate)
|
||||||
|
?> =(1 (lent moves))
|
||||||
|
?> ?=(^ moves)
|
||||||
|
?> ?=([* %give %made @da %complete *] i.moves)
|
||||||
|
=/ result result.p.card.i.moves
|
||||||
|
?> ?=([%success %reef *] build-result.result)
|
||||||
|
~
|
||||||
|
==
|
||||||
|
~& %test-reef-loaded
|
||||||
|
~! +6.ford-gate
|
||||||
|
.
|
||||||
|%
|
|%
|
||||||
:: +expect-schematic: assert a +schematic:ford is what we expect
|
++ verify-post-made
|
||||||
::
|
|= $: move=move:ford-gate
|
||||||
:: Since Ford requests contain types, we can't do simple
|
=duct
|
||||||
:: equality checking. This function handles all the different
|
=type
|
||||||
:: kinds of +schematic:ford, dealing with types as necessary.
|
date=@da
|
||||||
::
|
title=@tas
|
||||||
++ expect-schematic
|
contents=tape
|
||||||
|= [expected=schematic actual=schematic]
|
==
|
||||||
^- tang
|
^- tang
|
||||||
::
|
::
|
||||||
?^ -.expected
|
?> ?=([* %give %made @da %complete %success ^ *] move)
|
||||||
?. ?=(^ -.actual)
|
=/ result build-result.result.p.card.move
|
||||||
[%leaf "expected autocons, but got {<-.actual>}"]~
|
?> ?=([%success %scry %noun type-a=* @tas *] head.result)
|
||||||
|
?> ?=([%success ^ *] tail.result)
|
||||||
|
?> ?=([%success %ride type-title-a=* %post-a] head.tail.result)
|
||||||
|
?> ?=([%success %ride type-title-b=* %post-b] tail.tail.result)
|
||||||
::
|
::
|
||||||
%+ weld
|
;: welp
|
||||||
$(expected head.expected, actual head.actual)
|
%+ expect-eq
|
||||||
$(expected tail.expected, actual tail.actual)
|
!> duct
|
||||||
::
|
!> duct.move
|
||||||
?- -.expected
|
|
||||||
%$
|
|
||||||
?. ?=(%$ -.actual)
|
|
||||||
[%leaf "expected %$, but got {<-.actual>}"]~
|
|
||||||
::
|
|
||||||
%+ weld
|
|
||||||
(expect-eq !>(p.literal.expected) !>(p.literal.actual))
|
|
||||||
(expect-eq q.literal.expected q.literal.actual)
|
|
||||||
::
|
|
||||||
%pin
|
|
||||||
::
|
|
||||||
?. ?=(%pin -.actual)
|
|
||||||
[%leaf "expected %pin, but got {<-.actual>}"]~
|
|
||||||
::
|
|
||||||
%+ weld
|
|
||||||
(expect-eq !>(date.expected) !>(date.actual))
|
|
||||||
$(expected schematic.expected, actual schematic.actual)
|
|
||||||
::
|
|
||||||
%alts
|
|
||||||
::
|
|
||||||
?. ?=(%alts -.actual)
|
|
||||||
[%leaf "expected %alts, but got {<-.actual>}"]~
|
|
||||||
::
|
|
||||||
|- ^- tang
|
|
||||||
?~ choices.expected
|
|
||||||
:: make sure there aren't any extra :choices in :actual
|
|
||||||
::
|
|
||||||
?~ choices.actual
|
|
||||||
~
|
|
||||||
[%leaf "actual had more choices than expected"]~
|
|
||||||
:: :expected isn't empty yet; make sure :actual isn't either
|
|
||||||
::
|
|
||||||
?~ choices.actual
|
|
||||||
[%leaf "expected had more choices than actual"]~
|
|
||||||
:: recurse on the first sub-schematic
|
|
||||||
::
|
|
||||||
%+ weld
|
|
||||||
^$(expected i.choices.expected, actual i.choices.actual)
|
|
||||||
$(choices.expected t.choices.expected, choices.actual t.choices.actual)
|
|
||||||
::
|
|
||||||
%bake
|
|
||||||
(expect-eq [schematic-type expected] [schematic-type actual])
|
|
||||||
::
|
|
||||||
%bunt
|
|
||||||
(expect-eq [schematic-type expected] [schematic-type actual])
|
|
||||||
::
|
|
||||||
%call
|
|
||||||
::
|
|
||||||
?. ?=(%call -.actual)
|
|
||||||
[%leaf "expected %call, but got {<-.actual>}"]~
|
|
||||||
::
|
|
||||||
%+ weld
|
|
||||||
$(expected gate.expected, actual gate.actual)
|
|
||||||
$(expected sample.expected, actual sample.actual)
|
|
||||||
::
|
|
||||||
%cast
|
|
||||||
::
|
|
||||||
?. ?=(%cast -.actual)
|
|
||||||
[%leaf "expected %cast, but got {<-.actual>}"]~
|
|
||||||
::
|
|
||||||
;: weld
|
|
||||||
(expect-eq !>(disc.expected) !>(disc.actual))
|
|
||||||
(expect-eq !>(mark.expected) !>(mark.actual))
|
|
||||||
$(expected input.expected, actual input.actual)
|
|
||||||
==
|
|
||||||
::
|
|
||||||
%core
|
|
||||||
(expect-eq [schematic-type expected] [schematic-type actual])
|
|
||||||
::
|
|
||||||
%diff
|
|
||||||
::
|
|
||||||
?. ?=(%diff -.actual)
|
|
||||||
[%leaf "expected %diff, but got {<-.actual>}"]~
|
|
||||||
::
|
|
||||||
;: weld
|
|
||||||
(expect-eq !>(disc.expected) !>(disc.actual))
|
|
||||||
$(expected start.expected, actual start.actual)
|
|
||||||
$(expected end.expected, actual end.actual)
|
|
||||||
==
|
|
||||||
::
|
|
||||||
%dude
|
|
||||||
::
|
|
||||||
?. ?=(%dude -.actual)
|
|
||||||
[%leaf "expected %dude, but got {<-.actual>}"]~
|
|
||||||
::
|
|
||||||
%+ weld
|
|
||||||
(expect-eq !>(error.expected) !>(error.actual))
|
|
||||||
$(expected attempt.expected, actual attempt.actual)
|
|
||||||
::
|
|
||||||
%hood
|
|
||||||
(expect-eq [schematic-type expected] [schematic-type actual])
|
|
||||||
::
|
|
||||||
%join
|
|
||||||
::
|
|
||||||
?. ?=(%join -.actual)
|
|
||||||
[%leaf "expected %join, but got {<-.actual>}"]~
|
|
||||||
::
|
|
||||||
;: weld
|
|
||||||
(expect-eq !>(disc.expected) !>(disc.actual))
|
|
||||||
(expect-eq !>(mark.expected) !>(mark.actual))
|
|
||||||
$(expected first.expected, actual first.actual)
|
|
||||||
$(expected second.expected, actual second.actual)
|
|
||||||
==
|
|
||||||
::
|
|
||||||
%list
|
|
||||||
::
|
|
||||||
?. ?=(%list -.actual)
|
|
||||||
[%leaf "expected %list, but got {<-.actual>}"]~
|
|
||||||
::
|
|
||||||
|- ^- tang
|
|
||||||
?~ schematics.expected
|
|
||||||
:: make sure there aren't any extra :schematics in :actual
|
|
||||||
::
|
|
||||||
?~ schematics.actual
|
|
||||||
~
|
|
||||||
[%leaf "actual had more schematics than expected"]~
|
|
||||||
:: :expected isn't empty yet; make sure :actual isn't either
|
|
||||||
::
|
|
||||||
?~ schematics.actual
|
|
||||||
[%leaf "expected had more schematics than actual"]~
|
|
||||||
::
|
|
||||||
%+ weld
|
|
||||||
^$(expected i.schematics.expected, actual i.schematics.actual)
|
|
||||||
::
|
|
||||||
%_ $
|
|
||||||
schematics.expected t.schematics.expected
|
|
||||||
schematics.actual t.schematics.actual
|
|
||||||
==
|
|
||||||
::
|
|
||||||
%mash
|
|
||||||
::
|
|
||||||
?. ?=(%mash -.actual)
|
|
||||||
[%leaf "expected %mash, but got {<-.actual>}"]~
|
|
||||||
::
|
|
||||||
;: weld
|
|
||||||
(expect-eq !>(disc.expected) !>(disc.actual))
|
|
||||||
(expect-eq !>(mark.expected) !>(mark.actual))
|
|
||||||
(expect-eq !>(disc.first.expected) !>(disc.first.actual))
|
|
||||||
(expect-eq !>(mark.first.expected) !>(mark.first.actual))
|
|
||||||
(expect-eq !>(disc.second.expected) !>(disc.second.actual))
|
|
||||||
(expect-eq !>(mark.second.expected) !>(mark.second.actual))
|
|
||||||
$(expected schematic.first.expected, actual schematic.first.actual)
|
|
||||||
$(expected schematic.second.expected, actual schematic.second.actual)
|
|
||||||
==
|
|
||||||
::
|
|
||||||
%mute
|
|
||||||
::
|
|
||||||
?. ?=(%mute -.actual)
|
|
||||||
[%leaf "expected %mute, but got {<-.actual>}"]~
|
|
||||||
::
|
|
||||||
%+ weld $(expected subject.expected, actual subject.actual)
|
|
||||||
::
|
|
||||||
|- ^- tang
|
|
||||||
?~ mutations.expected
|
|
||||||
:: make sure there aren't any extra :mutations in :actual
|
|
||||||
::
|
|
||||||
?~ mutations.actual
|
|
||||||
~
|
|
||||||
[%leaf "actual had more mutations than expected"]~
|
|
||||||
:: :expected isn't empty yet; make sure :actual isn't either
|
|
||||||
::
|
|
||||||
?~ mutations.actual
|
|
||||||
[%leaf "expected had more mutations than actual"]~
|
|
||||||
::
|
|
||||||
;: weld
|
|
||||||
(expect-eq !>(p.i.mutations.expected) !>(p.i.mutations.actual))
|
|
||||||
^$(expected q.i.mutations.expected, actual q.i.mutations.actual)
|
|
||||||
%_ $
|
|
||||||
mutations.expected t.mutations.expected
|
|
||||||
mutations.actual t.mutations.actual
|
|
||||||
==
|
|
||||||
==
|
|
||||||
::
|
|
||||||
%pact
|
|
||||||
::
|
|
||||||
?. ?=(%pact -.actual)
|
|
||||||
[%leaf "expected %pact, but got {<-.actual>}"]~
|
|
||||||
::
|
|
||||||
;: weld
|
|
||||||
(expect-eq !>(disc.expected) !>(disc.actual))
|
|
||||||
$(expected start.expected, actual start.actual)
|
|
||||||
$(expected diff.expected, actual diff.actual)
|
|
||||||
==
|
|
||||||
::
|
|
||||||
%path
|
|
||||||
(expect-eq [schematic-type expected] [schematic-type actual])
|
|
||||||
::
|
|
||||||
%plan
|
|
||||||
(expect-eq [schematic-type expected] [schematic-type actual])
|
|
||||||
::
|
|
||||||
%reef
|
|
||||||
(expect-eq [schematic-type expected] [schematic-type actual])
|
|
||||||
::
|
|
||||||
%ride
|
|
||||||
::
|
|
||||||
?. ?=(%ride -.actual)
|
|
||||||
[%leaf "expected %ride, but got {<-.actual>}"]~
|
|
||||||
::
|
|
||||||
%+ weld
|
|
||||||
(expect-eq !>(formula.expected) !>(formula.actual))
|
|
||||||
$(expected subject.expected, actual subject.actual)
|
|
||||||
::
|
|
||||||
%same
|
|
||||||
::
|
|
||||||
?. ?=(%same -.actual)
|
|
||||||
[%leaf "expected %same, but got {<-.actual>}"]~
|
|
||||||
::
|
|
||||||
$(expected schematic.expected, actual schematic.actual)
|
|
||||||
::
|
|
||||||
%scry
|
|
||||||
(expect-eq [schematic-type expected] [schematic-type actual])
|
|
||||||
::
|
|
||||||
%slim
|
|
||||||
::
|
|
||||||
?. ?=(%slim -.actual)
|
|
||||||
[%leaf "expected %slim, but got {<-.actual>}"]~
|
|
||||||
::
|
|
||||||
%+ weld
|
|
||||||
(expect-eq !>(formula.expected) !>(formula.actual))
|
|
||||||
::
|
::
|
||||||
%+ expect-eq
|
%+ expect-eq
|
||||||
!>(`?`%.y)
|
!> date
|
||||||
^- vase
|
!> date.p.card.move
|
||||||
:- -:!>(*?)
|
|
||||||
^- ?
|
|
||||||
(~(nest ut subject-type.expected) | subject-type.actual)
|
|
||||||
::
|
::
|
||||||
%slit
|
%+ expect-eq
|
||||||
|
!> [%success %scry %noun *^type [title=title contents=contents]]
|
||||||
|
!> head.result(p.q.cage *^type)
|
||||||
::
|
::
|
||||||
?. ?=(%slit -.actual)
|
%+ expect-eq
|
||||||
[%leaf "expected %slit, but got {<-.actual>}"]~
|
!> &
|
||||||
|
!> (~(nest ut p.q.cage.head.result) | type)
|
||||||
::
|
::
|
||||||
%+ weld
|
%+ expect-eq
|
||||||
(expect-eq gate.expected gate.actual)
|
!> 'post-a'
|
||||||
(expect-eq sample.expected sample.actual)
|
vase.head.tail.result
|
||||||
::
|
::
|
||||||
?(%vale %volt)
|
%+ expect-eq
|
||||||
(expect-eq [schematic-type expected] [schematic-type actual])
|
!> 'post-b'
|
||||||
::
|
vase.tail.tail.result
|
||||||
%walk
|
|
||||||
(expect-eq [schematic-type expected] [schematic-type actual])
|
|
||||||
==
|
==
|
||||||
:: +schematic-type: the +type for +schematic:ford
|
++ scry-with-results
|
||||||
|
|= results=(map [=term =beam] cage)
|
||||||
|
|= [* (unit (set monk)) =term =beam]
|
||||||
|
^- (unit (unit cage))
|
||||||
|
::
|
||||||
|
=/ date=@da ?>(?=(%da -.r.beam) p.r.beam)
|
||||||
|
::
|
||||||
|
?^ reef=((scry-reef date) +<.$)
|
||||||
|
reef
|
||||||
|
::
|
||||||
|
~| scry-with-results+[term=term beam=beam]
|
||||||
|
::
|
||||||
|
[~ ~ (~(got by results) [term beam])]
|
||||||
|
:: +scry-with-results-and-failures
|
||||||
::
|
::
|
||||||
++ schematic-type ^~ `type`-:!>(*schematic:ford)
|
++ scry-with-results-and-failures
|
||||||
|
|= results=(map [=term =beam] (unit cage))
|
||||||
|
|= [* (unit (set monk)) =term =beam]
|
||||||
|
^- (unit (unit cage))
|
||||||
|
::
|
||||||
|
=/ date=@da ?>(?=(%da -.r.beam) p.r.beam)
|
||||||
|
::
|
||||||
|
?^ reef=((scry-reef date) +<.$)
|
||||||
|
reef
|
||||||
|
::
|
||||||
|
~| scry-with-results+[term=term beam=beam]
|
||||||
|
::
|
||||||
|
[~ (~(got by results) [term beam])]
|
||||||
|
:: +scry-succeed: produces a scry function with a known request and answer
|
||||||
|
::
|
||||||
|
++ scry-succeed
|
||||||
|
|= [date=@da result=cage] ^- sley
|
||||||
|
|= [* (unit (set monk)) =term =beam]
|
||||||
|
^- (unit (unit cage))
|
||||||
|
::
|
||||||
|
?^ reef=((scry-reef date) +<.$)
|
||||||
|
reef
|
||||||
|
::
|
||||||
|
~| scry-succeed+[beam+beam term+term]
|
||||||
|
?> =(term %cx)
|
||||||
|
?> =(beam [[~nul %desk %da date] /bar/foo])
|
||||||
|
::
|
||||||
|
[~ ~ result]
|
||||||
|
:: +scry-fail: produces a scry function with a known request and failed answer
|
||||||
|
::
|
||||||
|
++ scry-fail
|
||||||
|
|= date=@da ^- sley
|
||||||
|
|= [* (unit (set monk)) =term =beam]
|
||||||
|
^- (unit (unit cage))
|
||||||
|
::
|
||||||
|
?^ reef=((scry-reef date) +<.$)
|
||||||
|
reef
|
||||||
|
::
|
||||||
|
~| scry-fail+[beam+beam term+term]
|
||||||
|
?> =(term %cx)
|
||||||
|
?> =(beam [[~nul %desk %da date] /bar/foo])
|
||||||
|
::
|
||||||
|
[~ ~]
|
||||||
|
:: +scry-block: produces a scry function with known request and blocked answer
|
||||||
|
::
|
||||||
|
++ scry-block
|
||||||
|
|= date=@da ^- sley
|
||||||
|
|= [* (unit (set monk)) =term =beam]
|
||||||
|
^- (unit (unit cage))
|
||||||
|
::
|
||||||
|
?^ reef=((scry-reef date) +<.$)
|
||||||
|
reef
|
||||||
|
::
|
||||||
|
~| scry-block+[beam+beam term+term]
|
||||||
|
?> =(term %cx)
|
||||||
|
?> =(beam [[~nul %desk %da date] /bar/foo])
|
||||||
|
::
|
||||||
|
~
|
||||||
|
:: +scry-blocks: block on a file at multiple dates; does not include %reef
|
||||||
|
::
|
||||||
|
++ scry-blocks
|
||||||
|
|= dates=(set @da) ^- sley
|
||||||
|
|= [* (unit (set monk)) =term =beam]
|
||||||
|
^- (unit (unit cage))
|
||||||
|
::
|
||||||
|
~| scry-block+[beam+beam term+term]
|
||||||
|
?> =(term %cx)
|
||||||
|
?> ?=([%da @da] r.beam)
|
||||||
|
?> (~(has in dates) p.r.beam)
|
||||||
|
::
|
||||||
|
~
|
||||||
|
:: +scry-is-forbidden: makes sure ford does not attempt to scry
|
||||||
|
::
|
||||||
|
++ scry-is-forbidden ^- sley
|
||||||
|
|= [* (unit (set monk)) =term =beam]
|
||||||
|
^- (unit (unit cage))
|
||||||
|
::
|
||||||
|
=/ date=@da ?>(?=(%da -.r.beam) p.r.beam)
|
||||||
|
::
|
||||||
|
?^ reef=((scry-reef date) +<.$)
|
||||||
|
reef
|
||||||
|
::
|
||||||
|
~| scry-is-forbidden+[beam+beam term+term]
|
||||||
|
!!
|
||||||
|
::
|
||||||
|
++ scry-reef
|
||||||
|
|= date=@da ^- sley
|
||||||
|
|= [* (unit (set monk)) =term =beam]
|
||||||
|
^- (unit (unit cage))
|
||||||
|
::
|
||||||
|
=- ?~ res=(~(get by -) [term beam])
|
||||||
|
~
|
||||||
|
`res
|
||||||
|
::
|
||||||
|
(with-reef date ~)
|
||||||
|
::
|
||||||
|
++ with-reef
|
||||||
|
|= [date=@da scry-results=(map [term beam] cage)]
|
||||||
|
^+ scry-results
|
||||||
|
%- ~(gas by scry-results)
|
||||||
|
:~ :- [%cx [[~nul %home %da date] /hoon/hoon/sys]]
|
||||||
|
[%hoon !>(hoon-scry)]
|
||||||
|
:- [%cx [[~nul %home %da date] /hoon/arvo/sys]]
|
||||||
|
[%hoon !>(arvo-scry)]
|
||||||
|
:- [%cx [[~nul %home %da date] /hoon/zuse/sys]]
|
||||||
|
[%hoon !>(zuse-scry)]
|
||||||
|
::
|
||||||
|
:- [%cw [[~nul %home %da date] /hoon/hoon/sys]]
|
||||||
|
[%cass !>([ud=0 da=date])]
|
||||||
|
==
|
||||||
|
::
|
||||||
|
++ with-reef-unit
|
||||||
|
|= [date=@da scry-results=(map [term beam] (unit cage))]
|
||||||
|
^+ scry-results
|
||||||
|
%- ~(gas by scry-results)
|
||||||
|
:~ :- [%cx [[~nul %home %da date] /hoon/hoon/sys]]
|
||||||
|
`[%noun !>(~)]
|
||||||
|
:- [%cx [[~nul %home %da date] /hoon/arvo/sys]]
|
||||||
|
`[%noun !>(~)]
|
||||||
|
:- [%cx [[~nul %home %da date] /hoon/zuse/sys]]
|
||||||
|
`[%noun !>(~)]
|
||||||
|
::
|
||||||
|
:- [%cw [[~nul %home %da date] /hoon/hoon/sys]]
|
||||||
|
`[%cass !>([ud=0 da=date])]
|
||||||
|
==
|
||||||
|
::
|
||||||
|
++ ford-call
|
||||||
|
|= $: ford-gate=_ford-gate
|
||||||
|
now=@da
|
||||||
|
scry=sley
|
||||||
|
call-args=[=duct type=* wrapped-task=(hobo task:able:ford-gate)]
|
||||||
|
expected-moves=(list move:ford-gate)
|
||||||
|
==
|
||||||
|
^- [tang _ford-gate]
|
||||||
|
::
|
||||||
|
=/ ford (ford-gate our=~nul now=now eny=`@`0xdead.beef scry=scry)
|
||||||
|
::
|
||||||
|
=^ moves ford-gate
|
||||||
|
%- call:ford call-args
|
||||||
|
::
|
||||||
|
=/ output=tang
|
||||||
|
%+ expect-eq
|
||||||
|
!> expected-moves
|
||||||
|
!> moves
|
||||||
|
::
|
||||||
|
[output ford-gate]
|
||||||
|
::
|
||||||
|
++ ford-take
|
||||||
|
|= $: ford-gate=_ford-gate
|
||||||
|
now=@da
|
||||||
|
scry=sley
|
||||||
|
take-args=[=wire =duct wrapped-sign=(hypo sign:ford-gate)]
|
||||||
|
expected-moves=(list move:ford-gate)
|
||||||
|
==
|
||||||
|
^- [tang _ford-gate]
|
||||||
|
::
|
||||||
|
=/ ford (ford-gate our=~nul now=now eny=`@`0xdead.beef scry=scry)
|
||||||
|
::
|
||||||
|
=^ moves ford-gate
|
||||||
|
%- take:ford take-args
|
||||||
|
::
|
||||||
|
=/ output=tang
|
||||||
|
%+ expect-eq
|
||||||
|
!> expected-moves
|
||||||
|
!> moves
|
||||||
|
::
|
||||||
|
[output ford-gate]
|
||||||
|
:: +ford-call-with-comparator
|
||||||
|
::
|
||||||
|
:: Sometimes we can't just do simple comparisons between the moves statements
|
||||||
|
:: and must instead specify a gate that performs the comparisons.
|
||||||
|
::
|
||||||
|
++ ford-call-with-comparator
|
||||||
|
|= $: ford-gate=_ford-gate
|
||||||
|
now=@da
|
||||||
|
scry=sley
|
||||||
|
call-args=[=duct type=* wrapped-task=(hobo task:able:ford-gate)]
|
||||||
|
move-comparator=$-((list move:ford-gate) tang)
|
||||||
|
==
|
||||||
|
^- [tang _ford-gate]
|
||||||
|
::
|
||||||
|
=/ ford (ford-gate our=~nul now=now eny=`@`0xdead.beef scry=scry)
|
||||||
|
::
|
||||||
|
=^ moves ford-gate
|
||||||
|
%- call:ford call-args
|
||||||
|
::
|
||||||
|
=/ output=tang (move-comparator moves)
|
||||||
|
::
|
||||||
|
[output ford-gate]
|
||||||
|
:: +ford-take-with-comparator
|
||||||
|
::
|
||||||
|
++ ford-take-with-comparator
|
||||||
|
|= $: ford-gate=_ford-gate
|
||||||
|
now=@da
|
||||||
|
scry=sley
|
||||||
|
take-args=[=wire =duct wrapped-sign=(hypo sign:ford-gate)]
|
||||||
|
move-comparator=$-((list move:ford-gate) tang)
|
||||||
|
==
|
||||||
|
^- [tang _ford-gate]
|
||||||
|
::
|
||||||
|
=/ ford (ford-gate our=~nul now=now eny=`@`0xdead.beef scry=scry)
|
||||||
|
::
|
||||||
|
=^ moves ford-gate
|
||||||
|
%- take:ford take-args
|
||||||
|
::
|
||||||
|
=/ output=tang (move-comparator moves)
|
||||||
|
::
|
||||||
|
[output ford-gate]
|
||||||
|
:: +expect-cage: assert that the actual cage has the right mark and vase
|
||||||
|
::
|
||||||
|
++ expect-cage
|
||||||
|
|= [mark=term expected=vase actual=cage]
|
||||||
|
%+ weld
|
||||||
|
%+ expect-eq
|
||||||
|
!> mark
|
||||||
|
!> p.actual
|
||||||
|
::
|
||||||
|
(expect-eq expected q.actual)
|
||||||
|
:: +expect-ford-empty: assert that ford's state is one empty ship
|
||||||
|
::
|
||||||
|
:: At the end of every test, we want to assert that we have cleaned up all
|
||||||
|
:: state.
|
||||||
|
::
|
||||||
|
++ expect-ford-empty
|
||||||
|
|= [ford-gate=_ford-gate ship=@p]
|
||||||
|
^- tang
|
||||||
|
::
|
||||||
|
=^ results1 ford-gate
|
||||||
|
%- ford-call :*
|
||||||
|
ford-gate
|
||||||
|
now=~1234.5.6
|
||||||
|
scry=scry-is-forbidden
|
||||||
|
call-args=[duct=~[/empty] type=~ [%keep 0 0]]
|
||||||
|
expected-moves=~
|
||||||
|
==
|
||||||
|
::
|
||||||
|
=/ ford *ford-gate
|
||||||
|
=/ state state.ax.+>+<.ford
|
||||||
|
::
|
||||||
|
=/ default-state *ford-state:ford
|
||||||
|
::
|
||||||
|
=. max-size.compiler-cache.state max-size.compiler-cache.default-state
|
||||||
|
=. max-size.queue.build-cache.state max-size.queue.build-cache.default-state
|
||||||
|
=. next-anchor-id.build-cache.state 0
|
||||||
|
::
|
||||||
|
%+ welp results1
|
||||||
|
::
|
||||||
|
?: =(default-state state)
|
||||||
|
~
|
||||||
|
::
|
||||||
|
=/ build-state=(list tank)
|
||||||
|
%- zing
|
||||||
|
%+ turn ~(tap by builds.state)
|
||||||
|
|= [build=build:ford build-status=build-status:ford]
|
||||||
|
:~ [%leaf (build-to-tape:ford build)]
|
||||||
|
[%leaf "requesters: {<requesters.build-status>}"]
|
||||||
|
[%leaf "clients: {<~(tap in ~(key by clients.build-status))>}"]
|
||||||
|
==
|
||||||
|
::
|
||||||
|
=/ braces [[' ' ' ' ~] ['{' ~] ['}' ~]]
|
||||||
|
::
|
||||||
|
:~ [%leaf "failed to cleanup"]
|
||||||
|
[%leaf "builds.state:"]
|
||||||
|
[%rose braces build-state]
|
||||||
|
==
|
||||||
--
|
--
|
||||||
|
|||||||
@ -4658,24 +4658,6 @@
|
|||||||
::
|
::
|
||||||
?. ?=([~ %success %scry *] zuse-scry-result)
|
?. ?=([~ %success %scry *] zuse-scry-result)
|
||||||
(wrap-error zuse-scry-result)
|
(wrap-error zuse-scry-result)
|
||||||
:: short-circuit to :pit if asked for current %home desk
|
|
||||||
::
|
|
||||||
:: This avoids needing to recompile the kernel if we're asked
|
|
||||||
:: for the kernel we're already running. Note that this fails
|
|
||||||
:: referential transparency if |autoload is turned off.
|
|
||||||
::
|
|
||||||
?: ?& |(=(disc [our %home]) =(disc [our %base]))
|
|
||||||
:: is :date.build the latest commit on the %home desk?
|
|
||||||
::
|
|
||||||
?| =(now date.build)
|
|
||||||
::
|
|
||||||
=/ =beam [[our %home [%da date.build]] /hoon/hoon/sys]
|
|
||||||
::
|
|
||||||
.= (scry [%141 %noun] ~ %cw beam)
|
|
||||||
(scry [%141 %noun] ~ %cw beam(r [%da now]))
|
|
||||||
== ==
|
|
||||||
::
|
|
||||||
(return-result %success %reef pit)
|
|
||||||
:: omit case from path to prevent cache misses
|
:: omit case from path to prevent cache misses
|
||||||
::
|
::
|
||||||
=/ hoon-path=path
|
=/ hoon-path=path
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
/+ *test, test-ford
|
/+ *test, test-ford-external
|
||||||
::
|
::
|
||||||
/= clay-raw /: /===/sys/vane/clay /!noun/
|
/= clay-raw /: /===/sys/vane/clay /!noun/
|
||||||
::
|
::
|
||||||
@ -69,7 +69,7 @@
|
|||||||
%+ weld
|
%+ weld
|
||||||
(expect-eq !>(%.n) !>(live.note))
|
(expect-eq !>(%.n) !>(live.note))
|
||||||
::
|
::
|
||||||
%- expect-schematic:test-ford
|
%- expect-schematic:test-ford-external
|
||||||
:_ schematic.note
|
:_ schematic.note
|
||||||
^- schematic:ford
|
^- schematic:ford
|
||||||
:+ %pin ~1111.1.1
|
:+ %pin ~1111.1.1
|
||||||
@ -200,7 +200,7 @@
|
|||||||
%+ weld
|
%+ weld
|
||||||
(expect-eq !>(%.n) !>(live.note))
|
(expect-eq !>(%.n) !>(live.note))
|
||||||
::
|
::
|
||||||
%- expect-schematic:test-ford
|
%- expect-schematic:test-ford-external
|
||||||
:_ schematic.note
|
:_ schematic.note
|
||||||
^- schematic:ford
|
^- schematic:ford
|
||||||
[%pin ~1111.1.1 %list ~]
|
[%pin ~1111.1.1 %list ~]
|
||||||
@ -250,7 +250,7 @@
|
|||||||
%+ weld
|
%+ weld
|
||||||
(expect-eq !>(%.n) !>(live.note))
|
(expect-eq !>(%.n) !>(live.note))
|
||||||
::
|
::
|
||||||
%- expect-schematic:test-ford
|
%- expect-schematic:test-ford-external
|
||||||
:_ schematic.note
|
:_ schematic.note
|
||||||
^- schematic:ford
|
^- schematic:ford
|
||||||
:- %list
|
:- %list
|
||||||
@ -430,7 +430,7 @@
|
|||||||
%+ weld
|
%+ weld
|
||||||
(expect-eq !>(%.n) !>(live.note))
|
(expect-eq !>(%.n) !>(live.note))
|
||||||
::
|
::
|
||||||
%- expect-schematic:test-ford
|
%- expect-schematic:test-ford-external
|
||||||
:_ schematic.note
|
:_ schematic.note
|
||||||
^- schematic:ford
|
^- schematic:ford
|
||||||
:+ %pin ~2222.2.2
|
:+ %pin ~2222.2.2
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
/+ *test, *test-ford
|
/+ *test, *test-ford-external
|
||||||
::
|
::
|
||||||
/= http-server-raw /: /===/sys/vane/eyre /!noun/
|
/= http-server-raw /: /===/sys/vane/eyre /!noun/
|
||||||
::
|
::
|
||||||
|
|||||||
@ -1,20 +1,4 @@
|
|||||||
/+ *test
|
/+ *test, *test-ford
|
||||||
::
|
|
||||||
/= ford-vane /: /===/sys/vane/ford /!noun/
|
|
||||||
::
|
|
||||||
/= hoon-scry /: /===/sys/hoon /hoon/
|
|
||||||
/= arvo-scry /: /===/sys/arvo /hoon/
|
|
||||||
/= zuse-scry /: /===/sys/zuse /hoon/
|
|
||||||
/= txt-scry /: /===/mar/txt /hoon/
|
|
||||||
/= diff-scry /: /===/mar/txt-diff /hoon/
|
|
||||||
::
|
|
||||||
!:
|
|
||||||
=, ford
|
|
||||||
=, format
|
|
||||||
::
|
|
||||||
=/ test-pit=vase !>(..zuse)
|
|
||||||
=/ ford-gate (ford-vane test-pit)
|
|
||||||
~! +6.ford-gate
|
|
||||||
::
|
::
|
||||||
|%
|
|%
|
||||||
++ test-tear ^- tang
|
++ test-tear ^- tang
|
||||||
@ -3560,17 +3544,7 @@
|
|||||||
=/ zuse-compiled=vase (slap pit-compiled zuse-parsed)
|
=/ zuse-compiled=vase (slap pit-compiled zuse-parsed)
|
||||||
~& %zuse-compiled
|
~& %zuse-compiled
|
||||||
::
|
::
|
||||||
=/ scry-results=(map [term beam] cage)
|
=/ scry-results=(map [term beam] cage) (with-reef ~1234.5.6 ~)
|
||||||
%- my :~
|
|
||||||
:- [%cx [[~nul %base %da ~1234.5.6] /hoon/hoon/sys]]
|
|
||||||
[%noun !>(hoon-scry)]
|
|
||||||
::
|
|
||||||
:- [%cx [[~nul %base %da ~1234.5.6] /hoon/arvo/sys]]
|
|
||||||
[%noun !>(arvo-scry)]
|
|
||||||
::
|
|
||||||
:- [%cx [[~nul %base %da ~1234.5.6] /hoon/zuse/sys]]
|
|
||||||
[%noun !>(zuse-scry)]
|
|
||||||
==
|
|
||||||
::
|
::
|
||||||
=^ results1 ford-gate
|
=^ results1 ford-gate
|
||||||
%- ford-call-with-comparator :*
|
%- ford-call-with-comparator :*
|
||||||
@ -5036,6 +5010,7 @@
|
|||||||
::
|
::
|
||||||
=/ hoon-src-type=type [%atom %$ ~]
|
=/ hoon-src-type=type [%atom %$ ~]
|
||||||
=/ scry-results=(map [term beam] cage)
|
=/ scry-results=(map [term beam] cage)
|
||||||
|
%+ with-reef ~1234.5.6
|
||||||
%- my :~
|
%- my :~
|
||||||
:- [%cx [[~nul %home %da ~1234.5.6] /hoon/foo/ren]]
|
:- [%cx [[~nul %home %da ~1234.5.6] /hoon/foo/ren]]
|
||||||
:- %hoon
|
:- %hoon
|
||||||
@ -5090,6 +5065,7 @@
|
|||||||
=/ arch-type=type -:!>(*arch)
|
=/ arch-type=type -:!>(*arch)
|
||||||
::
|
::
|
||||||
=/ scry-results=(map [term beam] (unit cage))
|
=/ scry-results=(map [term beam] (unit cage))
|
||||||
|
%+ with-reef-unit ~1234.5.6
|
||||||
%- my :~
|
%- my :~
|
||||||
:- [%cx [[~nul %home %da ~1234.5.6] /hoon/foo/mar]]
|
:- [%cx [[~nul %home %da ~1234.5.6] /hoon/foo/mar]]
|
||||||
:^ ~ %hoon hoon-src-type
|
:^ ~ %hoon hoon-src-type
|
||||||
@ -5148,6 +5124,7 @@
|
|||||||
?> ?=(^ moves)
|
?> ?=(^ moves)
|
||||||
?> ?=([* %give %made @da %complete *] i.moves)
|
?> ?=([* %give %made @da %complete *] i.moves)
|
||||||
=/ result result.p.card.i.moves
|
=/ result result.p.card.i.moves
|
||||||
|
~| build-result.result
|
||||||
?> ?=([%success %bake *] build-result.result)
|
?> ?=([%success %bake *] build-result.result)
|
||||||
::
|
::
|
||||||
=/ =cage cage.build-result.result
|
=/ =cage cage.build-result.result
|
||||||
@ -5165,6 +5142,7 @@
|
|||||||
::
|
::
|
||||||
=/ hoon-src-type=type [%atom %$ ~]
|
=/ hoon-src-type=type [%atom %$ ~]
|
||||||
=/ scry-results=(map [term beam] (unit cage))
|
=/ scry-results=(map [term beam] (unit cage))
|
||||||
|
%+ with-reef-unit ~1234.5.6
|
||||||
%- my :~
|
%- my :~
|
||||||
:- [%cx [[~nul %home %da ~1234.5.6] /hoon/dat/ren]]
|
:- [%cx [[~nul %home %da ~1234.5.6] /hoon/dat/ren]]
|
||||||
:^ ~ %hoon hoon-src-type
|
:^ ~ %hoon hoon-src-type
|
||||||
@ -7085,310 +7063,4 @@
|
|||||||
--
|
--
|
||||||
'''
|
'''
|
||||||
==
|
==
|
||||||
::
|
|
||||||
:: |utilities: helper arms
|
|
||||||
::
|
|
||||||
::+| utilities
|
|
||||||
++ verify-post-made
|
|
||||||
|= $: move=move:ford-gate
|
|
||||||
=duct
|
|
||||||
=type
|
|
||||||
date=@da
|
|
||||||
title=@tas
|
|
||||||
contents=tape
|
|
||||||
==
|
|
||||||
^- tang
|
|
||||||
::
|
|
||||||
?> ?=([* %give %made @da %complete %success ^ *] move)
|
|
||||||
=/ result build-result.result.p.card.move
|
|
||||||
?> ?=([%success %scry %noun type-a=* @tas *] head.result)
|
|
||||||
?> ?=([%success ^ *] tail.result)
|
|
||||||
?> ?=([%success %ride type-title-a=* %post-a] head.tail.result)
|
|
||||||
?> ?=([%success %ride type-title-b=* %post-b] tail.tail.result)
|
|
||||||
::
|
|
||||||
;: welp
|
|
||||||
%+ expect-eq
|
|
||||||
!> duct
|
|
||||||
!> duct.move
|
|
||||||
::
|
|
||||||
%+ expect-eq
|
|
||||||
!> date
|
|
||||||
!> date.p.card.move
|
|
||||||
::
|
|
||||||
%+ expect-eq
|
|
||||||
!> [%success %scry %noun *^type [title=title contents=contents]]
|
|
||||||
!> head.result(p.q.cage *^type)
|
|
||||||
::
|
|
||||||
%+ expect-eq
|
|
||||||
!> &
|
|
||||||
!> (~(nest ut p.q.cage.head.result) | type)
|
|
||||||
::
|
|
||||||
%+ expect-eq
|
|
||||||
!> 'post-a'
|
|
||||||
vase.head.tail.result
|
|
||||||
::
|
|
||||||
%+ expect-eq
|
|
||||||
!> 'post-b'
|
|
||||||
vase.tail.tail.result
|
|
||||||
==
|
|
||||||
++ scry-with-results
|
|
||||||
|= results=(map [=term =beam] cage)
|
|
||||||
|= [* (unit (set monk)) =term =beam]
|
|
||||||
^- (unit (unit cage))
|
|
||||||
::
|
|
||||||
=/ date=@da ?>(?=(%da -.r.beam) p.r.beam)
|
|
||||||
::
|
|
||||||
?^ reef=((scry-reef date) +<.$)
|
|
||||||
reef
|
|
||||||
::
|
|
||||||
~| scry-with-results+[term=term beam=beam]
|
|
||||||
::
|
|
||||||
[~ ~ (~(got by results) [term beam])]
|
|
||||||
:: +scry-with-results-and-failures
|
|
||||||
::
|
|
||||||
++ scry-with-results-and-failures
|
|
||||||
|= results=(map [=term =beam] (unit cage))
|
|
||||||
|= [* (unit (set monk)) =term =beam]
|
|
||||||
^- (unit (unit cage))
|
|
||||||
::
|
|
||||||
=/ date=@da ?>(?=(%da -.r.beam) p.r.beam)
|
|
||||||
::
|
|
||||||
?^ reef=((scry-reef date) +<.$)
|
|
||||||
reef
|
|
||||||
::
|
|
||||||
~| scry-with-results+[term=term beam=beam]
|
|
||||||
::
|
|
||||||
[~ (~(got by results) [term beam])]
|
|
||||||
:: +scry-succeed: produces a scry function with a known request and answer
|
|
||||||
::
|
|
||||||
++ scry-succeed
|
|
||||||
|= [date=@da result=cage] ^- sley
|
|
||||||
|= [* (unit (set monk)) =term =beam]
|
|
||||||
^- (unit (unit cage))
|
|
||||||
::
|
|
||||||
?^ reef=((scry-reef date) +<.$)
|
|
||||||
reef
|
|
||||||
::
|
|
||||||
~| scry-succeed+[beam+beam term+term]
|
|
||||||
?> =(term %cx)
|
|
||||||
?> =(beam [[~nul %desk %da date] /bar/foo])
|
|
||||||
::
|
|
||||||
[~ ~ result]
|
|
||||||
:: +scry-fail: produces a scry function with a known request and failed answer
|
|
||||||
::
|
|
||||||
++ scry-fail
|
|
||||||
|= date=@da ^- sley
|
|
||||||
|= [* (unit (set monk)) =term =beam]
|
|
||||||
^- (unit (unit cage))
|
|
||||||
::
|
|
||||||
?^ reef=((scry-reef date) +<.$)
|
|
||||||
reef
|
|
||||||
::
|
|
||||||
~| scry-fail+[beam+beam term+term]
|
|
||||||
?> =(term %cx)
|
|
||||||
?> =(beam [[~nul %desk %da date] /bar/foo])
|
|
||||||
::
|
|
||||||
[~ ~]
|
|
||||||
:: +scry-block: produces a scry function with known request and blocked answer
|
|
||||||
::
|
|
||||||
++ scry-block
|
|
||||||
|= date=@da ^- sley
|
|
||||||
|= [* (unit (set monk)) =term =beam]
|
|
||||||
^- (unit (unit cage))
|
|
||||||
::
|
|
||||||
?^ reef=((scry-reef date) +<.$)
|
|
||||||
reef
|
|
||||||
::
|
|
||||||
~| scry-block+[beam+beam term+term]
|
|
||||||
?> =(term %cx)
|
|
||||||
?> =(beam [[~nul %desk %da date] /bar/foo])
|
|
||||||
::
|
|
||||||
~
|
|
||||||
:: +scry-blocks: block on a file at multiple dates; does not include %reef
|
|
||||||
::
|
|
||||||
++ scry-blocks
|
|
||||||
|= dates=(set @da) ^- sley
|
|
||||||
|= [* (unit (set monk)) =term =beam]
|
|
||||||
^- (unit (unit cage))
|
|
||||||
::
|
|
||||||
~| scry-block+[beam+beam term+term]
|
|
||||||
?> =(term %cx)
|
|
||||||
?> ?=([%da @da] r.beam)
|
|
||||||
?> (~(has in dates) p.r.beam)
|
|
||||||
::
|
|
||||||
~
|
|
||||||
:: +scry-is-forbidden: makes sure ford does not attempt to scry
|
|
||||||
::
|
|
||||||
++ scry-is-forbidden ^- sley
|
|
||||||
|= [* (unit (set monk)) =term =beam]
|
|
||||||
^- (unit (unit cage))
|
|
||||||
::
|
|
||||||
=/ date=@da ?>(?=(%da -.r.beam) p.r.beam)
|
|
||||||
::
|
|
||||||
?^ reef=((scry-reef date) +<.$)
|
|
||||||
reef
|
|
||||||
::
|
|
||||||
~| scry-is-forbidden+[beam+beam term+term]
|
|
||||||
!!
|
|
||||||
::
|
|
||||||
++ scry-reef
|
|
||||||
|= date=@da ^- sley
|
|
||||||
|= [* (unit (set monk)) =term =beam]
|
|
||||||
^- (unit (unit cage))
|
|
||||||
::
|
|
||||||
=- ?~ res=(~(get by -) [term beam])
|
|
||||||
~
|
|
||||||
`res
|
|
||||||
::
|
|
||||||
%- ~(gas by *(map [^term ^beam] cage))
|
|
||||||
:~ :- [%cx [[~nul %home %da date] /hoon/hoon/sys]]
|
|
||||||
[%noun !>(~)]
|
|
||||||
:- [%cx [[~nul %home %da date] /hoon/arvo/sys]]
|
|
||||||
[%noun !>(~)]
|
|
||||||
:- [%cx [[~nul %home %da date] /hoon/zuse/sys]]
|
|
||||||
[%noun !>(~)]
|
|
||||||
::
|
|
||||||
:- [%cw [[~nul %home %da date] /hoon/hoon/sys]]
|
|
||||||
[%cass !>([ud=0 da=date])]
|
|
||||||
==
|
|
||||||
::
|
|
||||||
++ ford-call
|
|
||||||
|= $: ford-gate=_ford-gate
|
|
||||||
now=@da
|
|
||||||
scry=sley
|
|
||||||
call-args=[=duct type=* wrapped-task=(hobo task:able:ford-gate)]
|
|
||||||
expected-moves=(list move:ford-gate)
|
|
||||||
==
|
|
||||||
^- [tang _ford-gate]
|
|
||||||
::
|
|
||||||
=/ ford (ford-gate our=~nul now=now eny=`@`0xdead.beef scry=scry)
|
|
||||||
::
|
|
||||||
=^ moves ford-gate
|
|
||||||
%- call:ford call-args
|
|
||||||
::
|
|
||||||
=/ output=tang
|
|
||||||
%+ expect-eq
|
|
||||||
!> expected-moves
|
|
||||||
!> moves
|
|
||||||
::
|
|
||||||
[output ford-gate]
|
|
||||||
::
|
|
||||||
++ ford-take
|
|
||||||
|= $: ford-gate=_ford-gate
|
|
||||||
now=@da
|
|
||||||
scry=sley
|
|
||||||
take-args=[=wire =duct wrapped-sign=(hypo sign:ford-gate)]
|
|
||||||
expected-moves=(list move:ford-gate)
|
|
||||||
==
|
|
||||||
^- [tang _ford-gate]
|
|
||||||
::
|
|
||||||
=/ ford (ford-gate our=~nul now=now eny=`@`0xdead.beef scry=scry)
|
|
||||||
::
|
|
||||||
=^ moves ford-gate
|
|
||||||
%- take:ford take-args
|
|
||||||
::
|
|
||||||
=/ output=tang
|
|
||||||
%+ expect-eq
|
|
||||||
!> expected-moves
|
|
||||||
!> moves
|
|
||||||
::
|
|
||||||
[output ford-gate]
|
|
||||||
:: +ford-call-with-comparator
|
|
||||||
::
|
|
||||||
:: Sometimes we can't just do simple comparisons between the moves statements
|
|
||||||
:: and must instead specify a gate that performs the comparisons.
|
|
||||||
::
|
|
||||||
++ ford-call-with-comparator
|
|
||||||
|= $: ford-gate=_ford-gate
|
|
||||||
now=@da
|
|
||||||
scry=sley
|
|
||||||
call-args=[=duct type=* wrapped-task=(hobo task:able:ford-gate)]
|
|
||||||
move-comparator=$-((list move:ford-gate) tang)
|
|
||||||
==
|
|
||||||
^- [tang _ford-gate]
|
|
||||||
::
|
|
||||||
=/ ford (ford-gate our=~nul now=now eny=`@`0xdead.beef scry=scry)
|
|
||||||
::
|
|
||||||
=^ moves ford-gate
|
|
||||||
%- call:ford call-args
|
|
||||||
::
|
|
||||||
=/ output=tang (move-comparator moves)
|
|
||||||
::
|
|
||||||
[output ford-gate]
|
|
||||||
:: +ford-take-with-comparator
|
|
||||||
::
|
|
||||||
++ ford-take-with-comparator
|
|
||||||
|= $: ford-gate=_ford-gate
|
|
||||||
now=@da
|
|
||||||
scry=sley
|
|
||||||
take-args=[=wire =duct wrapped-sign=(hypo sign:ford-gate)]
|
|
||||||
move-comparator=$-((list move:ford-gate) tang)
|
|
||||||
==
|
|
||||||
^- [tang _ford-gate]
|
|
||||||
::
|
|
||||||
=/ ford (ford-gate our=~nul now=now eny=`@`0xdead.beef scry=scry)
|
|
||||||
::
|
|
||||||
=^ moves ford-gate
|
|
||||||
%- take:ford take-args
|
|
||||||
::
|
|
||||||
=/ output=tang (move-comparator moves)
|
|
||||||
::
|
|
||||||
[output ford-gate]
|
|
||||||
:: +expect-cage: assert that the actual cage has the right mark and vase
|
|
||||||
::
|
|
||||||
++ expect-cage
|
|
||||||
|= [mark=term expected=vase actual=cage]
|
|
||||||
%+ weld
|
|
||||||
%+ expect-eq
|
|
||||||
!> mark
|
|
||||||
!> p.actual
|
|
||||||
::
|
|
||||||
(expect-eq expected q.actual)
|
|
||||||
:: +expect-ford-empty: assert that ford's state is one empty ship
|
|
||||||
::
|
|
||||||
:: At the end of every test, we want to assert that we have cleaned up all
|
|
||||||
:: state.
|
|
||||||
::
|
|
||||||
++ expect-ford-empty
|
|
||||||
|= [ford-gate=_ford-gate ship=@p]
|
|
||||||
^- tang
|
|
||||||
::
|
|
||||||
=^ results1 ford-gate
|
|
||||||
%- ford-call :*
|
|
||||||
ford-gate
|
|
||||||
now=~1234.5.6
|
|
||||||
scry=scry-is-forbidden
|
|
||||||
call-args=[duct=~[/empty] type=~ [%keep 0 0]]
|
|
||||||
expected-moves=~
|
|
||||||
==
|
|
||||||
::
|
|
||||||
=/ ford *ford-gate
|
|
||||||
=/ state state.ax.+>+<.ford
|
|
||||||
::
|
|
||||||
=/ default-state *ford-state:ford
|
|
||||||
::
|
|
||||||
=. max-size.compiler-cache.state max-size.compiler-cache.default-state
|
|
||||||
=. max-size.queue.build-cache.state max-size.queue.build-cache.default-state
|
|
||||||
=. next-anchor-id.build-cache.state 0
|
|
||||||
::
|
|
||||||
%+ welp results1
|
|
||||||
::
|
|
||||||
?: =(default-state state)
|
|
||||||
~
|
|
||||||
::
|
|
||||||
=/ build-state=(list tank)
|
|
||||||
%- zing
|
|
||||||
%+ turn ~(tap by builds.state)
|
|
||||||
|= [build=build:ford build-status=build-status:ford]
|
|
||||||
:~ [%leaf (build-to-tape:ford build)]
|
|
||||||
[%leaf "requesters: {<requesters.build-status>}"]
|
|
||||||
[%leaf "clients: {<~(tap in ~(key by clients.build-status))>}"]
|
|
||||||
==
|
|
||||||
::
|
|
||||||
=/ braces [[' ' ' ' ~] ['{' ~] ['}' ~]]
|
|
||||||
::
|
|
||||||
:~ [%leaf "failed to cleanup"]
|
|
||||||
[%leaf "builds.state:"]
|
|
||||||
[%rose braces build-state]
|
|
||||||
==
|
|
||||||
--
|
--
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user