diff --git a/src/libstore-tests/dummy-store.cc b/src/libstore-tests/dummy-store.cc new file mode 100644 index 000000000..b841d7890 --- /dev/null +++ b/src/libstore-tests/dummy-store.cc @@ -0,0 +1,27 @@ +#include + +#include "nix/store/dummy-store.hh" +#include "nix/store/globals.hh" +#include "nix/store/realisation.hh" + +namespace nix { + +TEST(DummyStore, realisation_read) +{ + initLibStore(/*loadConfig=*/false); + + auto store = [] { + auto cfg = make_ref(StoreReference::Params{}); + cfg->readOnly = false; + return cfg->openStore(); + }(); + + auto drvHash = Hash::parseExplicitFormatUnprefixed( + "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad", HashAlgorithm::SHA256, HashFormat::Base16); + + auto outputName = "foo"; + + EXPECT_EQ(store->queryRealisation({drvHash, outputName}), nullptr); +} + +} // namespace nix diff --git a/src/libstore-tests/meson.build b/src/libstore-tests/meson.build index 915c10a38..dd817de32 100644 --- a/src/libstore-tests/meson.build +++ b/src/libstore-tests/meson.build @@ -61,6 +61,7 @@ sources = files( 'derivation.cc', 'derived-path.cc', 'downstream-placeholder.cc', + 'dummy-store.cc', 'http-binary-cache-store.cc', 'legacy-ssh-store.cc', 'local-binary-cache-store.cc', diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc index 4b485ca66..f60a72df4 100644 --- a/src/libstore/dummy-store.cc +++ b/src/libstore/dummy-store.cc @@ -2,7 +2,7 @@ #include "nix/util/archive.hh" #include "nix/util/callback.hh" #include "nix/util/memory-source-accessor.hh" -#include "nix/store/dummy-store.hh" +#include "nix/store/dummy-store-impl.hh" #include @@ -108,24 +108,15 @@ public: } // namespace -struct DummyStore : virtual Store +ref DummyStoreConfig::openStore() const +{ + return openDummyStore(); +} + +struct DummyStoreImpl : DummyStore { using Config = DummyStoreConfig; - ref config; - - struct PathInfoAndContents - { - UnkeyedValidPathInfo info; - ref contents; - }; - - /** - * This is map conceptually owns the file system objects for each - * store object. - */ - boost::concurrent_flat_map contents; - /** * This view conceptually just borrows the file systems objects of * each store object from `contents`, and combines them together @@ -135,9 +126,9 @@ struct DummyStore : virtual Store */ ref wholeStoreView = make_ref(); - DummyStore(ref config) + DummyStoreImpl(ref config) : Store{*config} - , config(config) + , DummyStore{config} { wholeStoreView->setPathDisplay(config->storeDir); } @@ -289,9 +280,9 @@ struct DummyStore : virtual Store } }; -ref DummyStore::Config::openStore() const +ref DummyStore::Config::openDummyStore() const { - return make_ref(ref{shared_from_this()}); + return make_ref(ref{shared_from_this()}); } static RegisterStoreImplementation regDummyStore; diff --git a/src/libstore/include/nix/store/dummy-store-impl.hh b/src/libstore/include/nix/store/dummy-store-impl.hh new file mode 100644 index 000000000..e05bb94ff --- /dev/null +++ b/src/libstore/include/nix/store/dummy-store-impl.hh @@ -0,0 +1,40 @@ +#pragma once +///@file + +#include "nix/store/dummy-store.hh" + +#include + +namespace nix { + +struct MemorySourceAccessor; + +/** + * Enough of the Dummy Store exposed for sake of writing unit tests + */ +struct DummyStore : virtual Store +{ + using Config = DummyStoreConfig; + + ref config; + + struct PathInfoAndContents + { + UnkeyedValidPathInfo info; + ref contents; + }; + + /** + * This is map conceptually owns the file system objects for each + * store object. + */ + boost::concurrent_flat_map contents; + + DummyStore(ref config) + : Store{*config} + , config(config) + { + } +}; + +} // namespace nix diff --git a/src/libstore/include/nix/store/dummy-store.hh b/src/libstore/include/nix/store/dummy-store.hh index e93aad366..95c09078c 100644 --- a/src/libstore/include/nix/store/dummy-store.hh +++ b/src/libstore/include/nix/store/dummy-store.hh @@ -5,6 +5,8 @@ namespace nix { +struct DummyStore; + struct DummyStoreConfig : public std::enable_shared_from_this, virtual StoreConfig { DummyStoreConfig(const Params & params) @@ -42,6 +44,11 @@ struct DummyStoreConfig : public std::enable_shared_from_this, return {"dummy"}; } + /** + * Same as `openStore`, just with a more precise return type. + */ + ref openDummyStore() const; + ref openStore() const override; StoreReference getReference() const override diff --git a/src/libstore/include/nix/store/meson.build b/src/libstore/include/nix/store/meson.build index 428ef00f3..ac72f04e2 100644 --- a/src/libstore/include/nix/store/meson.build +++ b/src/libstore/include/nix/store/meson.build @@ -34,6 +34,7 @@ headers = [ config_pub_h ] + files( 'derived-path-map.hh', 'derived-path.hh', 'downstream-placeholder.hh', + 'dummy-store-impl.hh', 'dummy-store.hh', 'export-import.hh', 'filetransfer.hh',