Fix tests

This commit is contained in:
Rebecca Turner 2024-02-08 15:55:20 -08:00
parent c0e7f50c1a
commit 953eb0cba2
Signed by: rbt
SSH key fingerprint: SHA256:SiNaEWabvotTldoNb5jIKqjJ3RnpS4aRXA4KLAdW5vs

View file

@ -26,7 +26,7 @@ namespace nix {
try { try {
state.error<EvalError>("puppy").withTrace(noPos, "doggy").debugThrow(); state.error<EvalError>("puppy").withTrace(noPos, "doggy").debugThrow();
} catch (Error & e) { } catch (Error & e) {
e.addTrace(state.positions[noPos], "beans", ""); e.addTrace(state.positions[noPos], "beans");
throw; throw;
} }
} catch (BaseError & e) { } catch (BaseError & e) {
@ -52,7 +52,7 @@ namespace nix {
try { try {
state.error<EvalError>("beans").debugThrow(); state.error<EvalError>("beans").debugThrow();
} catch (Error & e2) { } catch (Error & e2) {
e.addTrace(state.positions[noPos], "beans2", ""); e.addTrace(state.positions[noPos], "beans2");
//e2.addTrace(state.positions[noPos], "Something", ""); //e2.addTrace(state.positions[noPos], "Something", "");
ASSERT_TRUE(e.info().traces.size() == 2); ASSERT_TRUE(e.info().traces.size() == 2);
ASSERT_TRUE(e2.info().traces.size() == 0); ASSERT_TRUE(e2.info().traces.size() == 0);
@ -807,7 +807,7 @@ namespace nix {
ASSERT_TRACE2("genList 1 2", ASSERT_TRACE2("genList 1 2",
TypeError, TypeError,
HintFmt("expected a function but found %s: %s", "an integer", Uncolored(ANSI_CYAN "1" ANSI_NORMAL)), HintFmt("expected a function but found %s: %s", "an integer", Uncolored(ANSI_CYAN "1" ANSI_NORMAL)),
HintFmt("while evaluating the first argument passed to builtins.genList", "an integer")); HintFmt("while evaluating the first argument passed to builtins.genList"));
// XXX: defered // XXX: defered
// ASSERT_TRACE2("genList (x: x + \"foo\") 2 #TODO", // ASSERT_TRACE2("genList (x: x + \"foo\") 2 #TODO",