diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-06 17:31:51 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-10 07:13:25 +0000 |
| commit | 1cdc42df888dc98c347e03bd942ed9825a55bcb3 (patch) | |
| tree | 27aa457536e906712e4075a137af20510df8299d /nixpkgs/nixos/tests/ipfs.nix | |
| parent | f0205a49b465ab0e99502d2af4314526a1f90909 (diff) | |
| parent | 1b8af3e1ae75df048fbdfb3acf6842f13de3e38f (diff) | |
| download | nixlib-1cdc42df888dc98c347e03bd942ed9825a55bcb3.tar nixlib-1cdc42df888dc98c347e03bd942ed9825a55bcb3.tar.gz nixlib-1cdc42df888dc98c347e03bd942ed9825a55bcb3.tar.bz2 nixlib-1cdc42df888dc98c347e03bd942ed9825a55bcb3.tar.lz nixlib-1cdc42df888dc98c347e03bd942ed9825a55bcb3.tar.xz nixlib-1cdc42df888dc98c347e03bd942ed9825a55bcb3.tar.zst nixlib-1cdc42df888dc98c347e03bd942ed9825a55bcb3.zip | |
Merge commit '1b8af3e1ae75df048fbdfb3acf6842f13de3e38f'
Diffstat (limited to 'nixpkgs/nixos/tests/ipfs.nix')
| -rw-r--r-- | nixpkgs/nixos/tests/ipfs.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/nixpkgs/nixos/tests/ipfs.nix b/nixpkgs/nixos/tests/ipfs.nix index 82234f969226..9c0ff5306e06 100644 --- a/nixpkgs/nixos/tests/ipfs.nix +++ b/nixpkgs/nixos/tests/ipfs.nix @@ -7,21 +7,28 @@ import ./make-test-python.nix ({ pkgs, ...} : { nodes.machine = { ... }: { services.ipfs = { enable = true; + # Also will add a unix domain socket socket API address, see module. + startWhenNeeded = true; apiAddress = "/ip4/127.0.0.1/tcp/2324"; }; }; testScript = '' start_all() - machine.wait_for_unit("ipfs") - machine.wait_until_succeeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id") + # IPv4 activation + + machine.succeed("ipfs --api /ip4/127.0.0.1/tcp/2324 id") ipfs_hash = machine.succeed( "echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | awk '{ print $2 }'" ) machine.succeed(f"ipfs cat /ipfs/{ipfs_hash.strip()} | grep fnord") + # Unix domain socket activation + + machine.stop_job("ipfs") + ipfs_hash = machine.succeed( "echo fnord2 | ipfs --api /unix/run/ipfs.sock add | awk '{ print $2 }'" ) |