Diorama-based app spec tests

.gitattributes

@@ -0,0 +1,6 @@
+* text=auto
+* text eol=lf
+* text eol=lf
+
+[core]
+autocrlf=input

.gitignore

@@ -36,6 +36,7 @@ tmp-test-conductor-config.toml
 tmp-*-conductor-config.toml
 
 app_spec_proc_macro/test/*
+**/diorama-storage
 
 Cargo.lock
 dist/**

Vagrantfile

@@ -12,6 +12,8 @@ Vagrant.configure("2") do |config|
 
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://vagrantcloud.com/search.
+  # config.vm.box = "holochain-vagrant"
+  # config.vm.box_url = "https://holochain-vagrant-builds.s3-us-west-2.amazonaws.com/holochain-vagrant.zip"
   config.vm.box = "nixos/nixos-18.03-x86_64"
 
   # Disable automatic box update checking. If you disable this, then
@@ -54,7 +56,7 @@ Vagrant.configure("2") do |config|
   #
   config.vm.provider "virtualbox" do |vb|
   #   # Display the VirtualBox GUI when booting the machine
-    vb.gui = true
+    vb.gui = false
   #
     # Customize the amount of memory on the VM:
     vb.memory = "10000"
@@ -65,20 +67,21 @@ Vagrant.configure("2") do |config|
   # View the documentation for the provider you are using for more
   # information on available options.
 
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  # config.vm.provision "shell", inline: <<-SHELL
-  #   apt-get update
-  #   apt-get install -y apache2
-  # SHELL
+  # vagrant plugin install vagrant-nixos-plugin
+  # config.vm.provision :shell, inline: "fallocate -l 4G /swapfile && chmod 0600 /swapfile && mkswap /swapfile && swapon /swapfile"
+
+  # add some simple dev tools
+  config.vm.provision :nixos,
+    run: 'always',
+    expression: {
+      swapDevices: [ { device: "/swapfile", size: 10000 } ],
+      environment: {
+        systemPackages: [ :htop, :dos2unix, :vim ]
+      }
+    }
+
 
   # https://askubuntu.com/questions/317338/how-can-i-increase-disk-size-on-a-vagrant-vm
-  config.disksize.size = '50GB'
+  # config.disksize.size = '50GB'
 
-config.vm.provision "shell", inline: <<-SHELL
-  # curl https://nixos.org/nix/install | sh
-  # . /home/vagrant/.nix-profile/etc/profile.d/nix.sh
-  # ( cd /vagrant && nix-shell --run hc-test )
-SHELL
 end

app_spec/build_and_test.sh

@@ -1,8 +1,11 @@
-#! /bin/bash
+#!/usr/bin/env bash
 mkdir -p dist
 echo "===================================================================================="
 echo "RUNNING cargo test for zomes"
+echo "Using conductor binary: `which holochain`"
+echo "Using cli binary:       `which hc`"
 echo "------------------------------------------------------------------------------------"
+
 cargo test --manifest-path zomes/blog/code/Cargo.toml
 cargo test --manifest-path zomes/summer/code/Cargo.toml
 echo "===================================================================================="
@@ -17,4 +20,4 @@ echo "Running test.js in node"
 echo "------------------------------------------------------------------------------------"
 cd test
 npm install
-npm test
+npm run test-ci

app_spec/test/index.js

@@ -0,0 +1,31 @@
+const path = require('path')
+const tape = require('tape')
+
+const { Diorama, tapeExecutor, backwardCompatibilityMiddleware } = require('@holochain/diorama')
+
+process.on('unhandledRejection', error => {
+  // Will print "unhandledRejection err is not defined"
+  console.error('got unhandledRejection:', error);
+});
+
+const dnaPath = path.join(__dirname, "../dist/app_spec.dna.json")
+const dna = Diorama.dna(dnaPath, 'app-spec')
+
+const diorama = new Diorama({
+  instances: {
+    alice: dna,
+    bob: dna,
+    carol: dna,
+  },
+  bridges: [
+    Diorama.bridge('test-bridge', 'alice', 'bob')
+  ],
+  debugLog: false,
+  executor: tapeExecutor(require('tape')),
+  middleware: backwardCompatibilityMiddleware,
+})
+
+require('./regressions')(diorama.registerScenario)
+require('./test')(diorama.registerScenario)
+
+diorama.run()

app_spec/test/package.json

@@ -1,12 +1,14 @@
 {
   "devDependencies": {},
   "dependencies": {
+    "@holochain/diorama": "^0.1.1",
     "faucet": "0.0.1",
     "json3": "*",
     "sleep": "^5.2.3",
     "tape": "^4.9.1"
   },
   "scripts": {
-    "test": "./run.sh"
+    "test": "./run.sh",
+    "test-ci": "./run-ci.sh"
   }
 }

app_spec/test/regressions.js

@@ -1,68 +1,56 @@
-const path = require('path')
-const { Config, Conductor, Scenario } = require('../../nodejs_conductor')
-Scenario.setTape(require('tape'))
+module.exports = scenario => {
 
-const dnaPath = path.join(__dirname, "../dist/app_spec.dna.json")
-const dna = Config.dna(dnaPath, 'app-spec')
-const agentAlice = Config.agent("alice")
-const agentTash = Config.agent("tash")
+scenario('calling get_links before link_entries makes no difference', async (s, t, {alice}) => {
 
-const instanceAlice = Config.instance(agentAlice, dna)
-const instanceTash = Config.instance(agentTash, dna)
-
-const scenario = new Scenario([instanceAlice, instanceTash], { debugLog: true })
-
-scenario.runTape('calling get_links before link_entries makes no difference', async (t, {alice}) => {
-
-  const get1 = alice.call("blog", "my_posts", {})
+  const get1 = await alice.call("blog", "my_posts", {})
   t.ok(get1.Ok)
 
   const create1 = await alice.callSync("blog","create_post", {content: 'hi'})
   t.ok(create1.Ok)
 
-  const get2 = alice.call("blog", "my_posts", {})
+  const get2 = await alice.call("blog", "my_posts", {})
   t.ok(get2.Ok)
 
   t.equal(get2.Ok.links.length, 1)
 })
 
-scenario.runTape('calling get_links twice in a row is no different than calling it once', async (t, {alice}) => {
+scenario('calling get_links twice in a row is no different than calling it once', async (s, t, {alice}) => {
   // This test is exactly the same as the previous one, but calls my_posts twice in a row.
   // This makes the links come through the second time.
 
-  const get1 = alice.call("blog", "my_posts", {})
+  const get1 = await alice.call("blog", "my_posts", {})
   t.ok(get1.Ok)
 
   const create1 = await alice.callSync("blog", "create_post", {content: 'hi'})
   t.ok(create1.Ok)
 
-  alice.call("blog", "my_posts", {})
-  const get2 = alice.call("blog", "my_posts", {})
+  await alice.call("blog", "my_posts", {})
+  const get2 = await alice.call("blog", "my_posts", {})
   t.ok(get2.Ok)
 
   t.equal(get2.Ok.links.length, 1)
 })
 
-scenario.runTape('not calling get_links in the beginning is also ok', async (t, {alice}) => {
+scenario('not calling get_links in the beginning is also ok', async (s, t, {alice}) => {
 
   const create1 = await alice.callSync("blog", "create_post", {content: 'hi'})
   t.ok(create1.Ok)
 
-  const get1 = alice.call("blog", "my_posts", {})
+  const get1 = await alice.call("blog", "my_posts", {})
   t.ok(get1.Ok)
 
   t.equal(get1.Ok.links.length, 1)
 })
 
-scenario.runTape('alice create & publish post -> recommend own post to self', async (t, {alice, tash}) => {
+scenario('alice create & publish post -> recommend own post to self', async (s, t, {alice, bob}) => {
 
   const content = "Holo world...1"
   const params = { content: content, in_reply_to: null }
   const postResult = await alice.callSync("blog", "create_post", params)
   const postAddr = postResult.Ok
   t.ok(postAddr, `error: ${postResult}`)
 
-  const gotPost = alice.call("blog", "get_post", {post_address: postAddr})
+  const gotPost = await alice.call("blog", "get_post", {post_address: postAddr})
   t.ok(gotPost.Ok)
 
   let linked = await alice.callSync('blog', 'recommend_post', {
@@ -72,57 +60,59 @@ scenario.runTape('alice create & publish post -> recommend own post to self', as
   console.log("linked: ", linked)
   t.equal(linked.Ok, "QmZr5F34uGZjAEwmU574VwiRtXGHQmvbUnNgA2MJz7YcTr")
 
-  const recommendedPosts = alice.call('blog', 'my_recommended_posts', {})
+  const recommendedPosts = await alice.call('blog', 'my_recommended_posts', {})
   console.log("recommendedPosts", recommendedPosts)
   console.log('agent addresses: ', alice.agentId, alice.agentId)
 
   t.equal(recommendedPosts.Ok.links.length, 1)
 })
 
-scenario.runTape('alice create & publish post -> tash recommend to self', async (t, {alice, tash}) => {
+scenario('alice create & publish post -> bob recommend to self', async (s, t, {alice, bob}) => {
   const content = "Holo world...2"
   const params = { content: content, in_reply_to: null }
   const postResult = await alice.callSync("blog", "create_post", params)
   const postAddr = postResult.Ok
   t.ok(postAddr, `error: ${postResult}`)
 
-  const gotPost = tash.call("blog", "get_post", {post_address: postAddr})
+  const gotPost = await bob.call("blog", "get_post", {post_address: postAddr})
   t.ok(gotPost.Ok)
 
-  let linked = await tash.callSync('blog', 'recommend_post', {
+  let linked = await bob.callSync('blog', 'recommend_post', {
     post_address: postAddr,
-    agent_address: tash.agentId
+    agent_address: bob.agentId
   })
   console.log("linked: ", linked)
-  t.equal(linked.Ok, "QmT2Z8Hdkgxkt7X4ZeEkoDt3YTQBzyJa1RNPhfkj9icsQ4")
+  t.equal(linked.Ok, "QmaLKGRgSHv6z73FaseCgudGt9uZ9fPhBREUy3gZ1C8s2K")
 
-  const recommendedPosts = tash.call("blog", "my_recommended_posts", {})
+  const recommendedPosts = await bob.call("blog", "my_recommended_posts", {})
   console.log("recommendedPosts", recommendedPosts)
-  console.log('agent addresses: ', alice.agentId, tash.agentId)
+  console.log('agent addresses: ', alice.agentId, bob.agentId)
 
   t.equal(recommendedPosts.Ok.links.length, 1)
 })
 
-scenario.runTape('create & publish post -> recommend to other agent', async (t, {alice, tash}) => {
+scenario('create & publish post -> recommend to other agent', async (s, t, {alice, bob}) => {
   const content = "Holo world...3"
   const params = { content: content, in_reply_to: null }
   const postResult = await alice.callSync("blog", "create_post", params)
   const postAddr = postResult.Ok
   t.ok(postAddr, `error: ${postResult}`)
 
-  const gotPost = tash.call("blog", "get_post", {post_address: postAddr})
+  const gotPost = await bob.call("blog", "get_post", {post_address: postAddr})
   t.ok(gotPost.Ok)
 
   let linked = await alice.callSync('blog', 'recommend_post', {
     post_address: postAddr,
-    agent_address: tash.agentId
+    agent_address: bob.agentId
   })
   console.log("linked: ", linked)
-  t.equal(linked.Ok, "QmUFkn3kTXuFmBvynEMQ4ox3WyvkkG4GtfvPkNqb5b7Ge7")
+  t.equal(linked.Ok, "QmWBQCMdgZURpxa7WsbxnnVNZcFxdaTV7mxVdgh9nHnVwT")
 
-  const recommendedPosts = tash.call('blog', 'my_recommended_posts', {})
+  const recommendedPosts = await bob.call('blog', 'my_recommended_posts', {})
   console.log("recommendedPosts", recommendedPosts)
-  console.log('agent addresses: ', alice.agentId, tash.agentId)
+  console.log('agent addresses: ', alice.agentId, bob.agentId)
 
   t.equal(recommendedPosts.Ok.links.length, 1)
 })
+
+}

app_spec/test/run-ci.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+mkdir -p diorama-storage
+
+STORAGE="`pwd`/diorama-storage"
+rm -fr $STORAGE
+mkdir $STORAGE
+if [ -z $1];
+then DIORAMA_STORAGE=$STORAGE node index.js | tee test.out~ | faucet || ( cat test.out~; false );
+else DIORAMA_STORAGE=$STORAGE node $1;
+fi;

app_spec/test/run.sh

@@ -1,4 +1,5 @@
+#!/usr/bin/env bash
 if [ -z $1];
-then tape test.js regressions.js | tee test.out~ | faucet || ( cat test.out~; false );
-else tape $1;
-fi;
+then node index.js | tee test.out~ | faucet || ( cat test.out~; false );
+else node $1;
+fi;