diff options
author | Vincent Ambo <mail@tazj.in> | 2020-07-19T13·37+0100 |
---|---|---|
committer | tazjin <mail@tazj.in> | 2020-07-19T16·33+0000 |
commit | 97e649922542ef66c9d80cb1b41817ed07c2c5a6 (patch) | |
tree | e5049c906005c19bfeb60901e8fda03739eaf42b | |
parent | bc7652d78323831f1b4520533299a8cbc4febcc6 (diff) |
test(3p/nix): Partially enable evaluator success tests r/1397
Enables the `eval-okay-` test suite, with some caveats: * The output is not yet checked against the expected value, so the tests only check that pure evaluation succeeds * A handful of tests have been disabled as they are causing failures that may be related to the DummyStore implementation. Both of these will be addressed in followup commits, but there is already some value in having the pure evaluation tests pass. Change-Id: I62236c95ebffb06dc64a45455a8ee04344c400b7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1284 Tested-by: BuildkiteCI Reviewed-by: isomer <isomer@tvl.fyi> Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to '')
-rw-r--r-- | third_party/nix/src/tests/lang/disabled/README.txt | 7 | ||||
-rw-r--r-- | third_party/nix/src/tests/lang/disabled/eval-okay-context-introspection.nix (renamed from third_party/nix/src/tests/lang/eval-okay-context-introspection.nix) | 0 | ||||
-rw-r--r-- | third_party/nix/src/tests/lang/disabled/eval-okay-context.nix (renamed from third_party/nix/src/tests/lang/eval-okay-context.nix) | 0 | ||||
-rw-r--r-- | third_party/nix/src/tests/lang/disabled/eval-okay-path.nix (renamed from third_party/nix/src/tests/lang/eval-okay-path.nix) | 0 | ||||
-rw-r--r-- | third_party/nix/src/tests/lang/disabled/eval-okay-search-path.nix (renamed from third_party/nix/src/tests/lang/eval-okay-search-path.nix) | 0 | ||||
-rw-r--r-- | third_party/nix/src/tests/lang/disabled/eval-okay-tail-call-1.nix (renamed from third_party/nix/src/tests/lang/eval-okay-tail-call-1.nix) | 0 | ||||
-rw-r--r-- | third_party/nix/src/tests/language-tests.cc | 21 |
7 files changed, 28 insertions, 0 deletions
diff --git a/third_party/nix/src/tests/lang/disabled/README.txt b/third_party/nix/src/tests/lang/disabled/README.txt new file mode 100644 index 000000000000..3dbcbf4f0dd9 --- /dev/null +++ b/third_party/nix/src/tests/lang/disabled/README.txt @@ -0,0 +1,7 @@ +These tests are disabeld primarily because the DummyStore used for +tests does not interact with real files on disk at the moment, but the +tests expect it to. + +Once we have a solution for this (potentially just reading & hashing +the files, but not writing them anywhere) these tests will be enabled +again. diff --git a/third_party/nix/src/tests/lang/eval-okay-context-introspection.nix b/third_party/nix/src/tests/lang/disabled/eval-okay-context-introspection.nix index 43178bd2eef9..43178bd2eef9 100644 --- a/third_party/nix/src/tests/lang/eval-okay-context-introspection.nix +++ b/third_party/nix/src/tests/lang/disabled/eval-okay-context-introspection.nix diff --git a/third_party/nix/src/tests/lang/eval-okay-context.nix b/third_party/nix/src/tests/lang/disabled/eval-okay-context.nix index 7b9531cfe9e1..7b9531cfe9e1 100644 --- a/third_party/nix/src/tests/lang/eval-okay-context.nix +++ b/third_party/nix/src/tests/lang/disabled/eval-okay-context.nix diff --git a/third_party/nix/src/tests/lang/eval-okay-path.nix b/third_party/nix/src/tests/lang/disabled/eval-okay-path.nix index e67168cf3edf..e67168cf3edf 100644 --- a/third_party/nix/src/tests/lang/eval-okay-path.nix +++ b/third_party/nix/src/tests/lang/disabled/eval-okay-path.nix diff --git a/third_party/nix/src/tests/lang/eval-okay-search-path.nix b/third_party/nix/src/tests/lang/disabled/eval-okay-search-path.nix index cca41f821f83..cca41f821f83 100644 --- a/third_party/nix/src/tests/lang/eval-okay-search-path.nix +++ b/third_party/nix/src/tests/lang/disabled/eval-okay-search-path.nix diff --git a/third_party/nix/src/tests/lang/eval-okay-tail-call-1.nix b/third_party/nix/src/tests/lang/disabled/eval-okay-tail-call-1.nix index a3962ce3fdb5..a3962ce3fdb5 100644 --- a/third_party/nix/src/tests/lang/eval-okay-tail-call-1.nix +++ b/third_party/nix/src/tests/lang/disabled/eval-okay-tail-call-1.nix diff --git a/third_party/nix/src/tests/language-tests.cc b/third_party/nix/src/tests/language-tests.cc index 7e53cd8f5eaa..daa2fa233e19 100644 --- a/third_party/nix/src/tests/language-tests.cc +++ b/third_party/nix/src/tests/language-tests.cc @@ -187,4 +187,25 @@ INSTANTIATE_TEST_SUITE_P(Eval, EvalFailureTest, testing::ValuesIn(TestFilesFor("eval-fail-")), TestNameFor); +class EvalSuccessTest : public testing::TestWithParam<std::filesystem::path> {}; + +// Test pattern for files that should fail to evaluate. +TEST_P(EvalSuccessTest, Fails) { + std::shared_ptr<Store> store = std::make_shared<DummyStore>(); + EvalState state({}, ref<Store>(store)); + auto path = GetParam(); + + Expr* expr; + EXPECT_NO_THROW(expr = state.parseExprFromFile(GetParam().string())) + << path.stem().string() << ": should parse successfully"; + + Value result; + state.eval(expr, result); + state.forceValue(result); +} + +INSTANTIATE_TEST_SUITE_P(Eval, EvalSuccessTest, + testing::ValuesIn(TestFilesFor("eval-okay-")), + TestNameFor); + } // namespace nix::tests |