greg/machi
1
0
Fork 0
Code Issues 11 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Our new unit test works, yay

Browse source
This commit is contained in:
Scott Lystig Fritchie 2015-08-25 19:42:33 +09:00
parent 83f49472db
commit c0ee323637
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/machi_projection_store.erl
View file

@ -276,7 +276,6 @@ do_proj_write2(ProjType, #projection_v1{epoch_csum=CSum}=Proj, S) ->
CSum2 when CSum2 == CSum ->
do_proj_write3(ProjType, Proj, S);
_Else ->
io:format(user, "Oops ~s epoch ~w csum ~W expected ~W\n", [S#state.public_dir, Proj#projection_v1.epoch_number, _Else, 6, CSum, 6]),
{{error, bad_arg}, S}
end.
@ -291,7 +290,16 @@ do_proj_write3(ProjType, #projection_v1{epoch_number=Epoch,
{ok, Bin} when ProjType == private ->
#projection_v1{epoch_number=CurEpoch,
epoch_csum=CurCSum} = _CurProj = binary_to_term(Bin),
{{error, written}, S};
%% We've already checked that CSum is correct matches the
%% contents of this new projection version. If the epoch_csum
%% values match, and if we trust the value on disk (TODO paranoid
%% check that, also), then the only difference must be the dbg2
%% list, which is ok.
if CurCSum == CSum ->
do_proj_write4(ProjType, Proj, Path, Epoch, S);
true ->
{{error, written}, S}
end;
{error, enoent} ->
do_proj_write4(ProjType, Proj, Path, Epoch, S);
{error, Else} ->

6
test/machi_projection_store_test.erl
View file

@ -45,12 +45,14 @@ smoke_test() ->
{error, bad_arg} = ?PS:write(a_pstore, public, Pbad),
ok = ?PS:write(a_pstore, private, P1),
{error, written} = ?PS:write(a_pstore, private, P1),
P1a = machi_projection:update_checksum(P1#projection_v1{dbg=[diff_yo]}),
{error, written} = ?PS:write(a_pstore, private, P1a),
P1b = P1#projection_v1{dbg2=[version_b]},
ok = ?PS:write(a_pstore, private, P1b),
P1c = P1#projection_v1{dbg2=[version_c]},
ok = ?PS:write(a_pstore, private, P1c),
{error, written} = ?PS:write(a_pstore, private, P1c),
{error, written} = ?PS:write(a_pstore, private, P1a),
ok
after