Bashtub Tests Working

buildkite/scripts/bash_tub_test.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+build_bacalhau() {
+  make build
+}
+
+
+bash_test() {
+  make bash-test
+}
+
+
+main () {
+  build_bacalhau
+  bash_test
+}
+
+main

cmd/util/fatal.go

@@ -14,16 +14,17 @@ import (
 var Fatal = fatalError
 
 func fatalError(cmd *cobra.Command, err error, code int) {
-	cmd.PrintErrln()
+	cmd.SetOut(os.Stdout)
+	cmd.Println()
 
 	var bErr bacerrors.Error
 	if errors.As(err, &bErr) {
 		// Print error message
-		cmd.PrintErrln(output.RedStr("Error: ") + bErr.Error())
+		cmd.Println(output.RedStr("Error: ") + bErr.Error())
 
 		// Print hint if available
 		if bErr.Hint() != "" {
-			cmd.PrintErrln(output.GreenStr("Hint:  ") + bErr.Hint())
+			cmd.Println(output.GreenStr("Hint:  ") + bErr.Hint())
 		}
 
 		// If debug mode, then print details and stack trace
@@ -37,14 +38,14 @@ func fatalError(cmd *cobra.Command, err error, code int) {
 			}
 			stackTrace := bErr.StackTrace()
 			if stackTrace != "" {
-				cmd.PrintErrln()
-				cmd.PrintErrln(output.YellowStr("Stack Trace:"))
-				cmd.PrintErrln(stackTrace)
+				cmd.Println()
+				cmd.Println(output.YellowStr("Stack Trace:"))
+				cmd.Println(stackTrace)
 			}
 		}
 
 	} else {
-		cmd.PrintErrln(output.RedStr("Error: ") + err.Error())
+		cmd.Println(output.RedStr("Error: ") + err.Error())
 	}
 	os.Exit(code)
 }

pkg/config/types/compute.go

@@ -2,7 +2,7 @@ package types
 
 type Compute struct {
 	// Enabled indicates whether the compute node is active and available for job execution.
-	Enabled bool `yaml:"Enabled,omitempty" json:"Enabled,omitempty"`
+	Enabled bool `yaml:"Enabled" json:"Enabled"`
 	// Orchestrators specifies a list of orchestrator endpoints that this compute node connects to.
 	Orchestrators []string `yaml:"Orchestrators,omitempty" json:"Orchestrators,omitempty"`
 	// Auth specifies the authentication configuration for compute nodes to connect to the orchestrator.

test/bin/bacalhau.sh

@@ -17,7 +17,18 @@ clean_repo() {
 create_node() {
     TYPE=$1
     shift 1
-    $BACALHAU serve --node-type=$TYPE $@ 1>$BACALHAU_DIR/out.log 2>$BACALHAU_DIR/err.log &
+
+    if [[ "$TYPE" == *","* ]]; then
+        # Split the types and run the command with both
+        IFS=',' read -ra TYPES <<< "$TYPE"
+        $BACALHAU serve --"${TYPES[0]}" --"${TYPES[1]}" "$@" 1>$BACALHAU_DIR/out.log 2>$BACALHAU_DIR/err.log &
+        echo $BACALHAU serve --"${TYPES[0]}" --"${TYPES[1]}" "$@" 1>$BACALHAU_DIR/out.log 2>$BACALHAU_DIR/err.log
+    else
+        # Run the command with the single type
+        $BACALHAU serve --"$TYPE" "$@" 1>$BACALHAU_DIR/out.log 2>$BACALHAU_DIR/err.log &
+        echo $BACALHAU serve --"$TYPE" "$@" 1>$BACALHAU_DIR/out.log 2>$BACALHAU_DIR/err.log
+    fi
+
     NODE_PID=$!
     RUNNING_NODES+=($NODE_PID)
     {

test/config_set_persistent.sh

@@ -5,18 +5,12 @@ source bin/bacalhau.sh
 
 testcase_config_set_is_persistent() {
    TEST_VALUE=$RANDOM
-   subject bacalhau config set --config=./test-persistent.yaml 'NameProvider' $TEST_VALUE
-   assert_equal 0 $status
-
-   subject file ./test-persistent.yaml
+   touch test-persistent.yaml
+   subject ${BACALHAU} config set --config=./test-persistent.yaml 'NameProvider' $TEST_VALUE
    assert_equal 0 $status
 
    # Verify the contents of the config file
    subject cat "./test-persistent.yaml | grep -i NameProvider"
    assert_match "${TEST_VALUE}" "$stdout"
    rm ./test-persistent.yaml
 }
-
-
-
-

test/config_with_defaults.sh

@@ -18,4 +18,3 @@ testcase_config_with__defaults() {
 
   kill $SERVER_PID
 }
-

test/config_with_file.sh

@@ -16,8 +16,7 @@ testcase_config_with_file() {
 
   # These are values set in the config file
   assert_match "uuid" $(echo $stdout | jq .NameProvider)
-  assert_match "bar" $(echo $stdout | jq .Compute.Labels.foo)
+  assert_match "bar" $(echo $stdout | jq .Labels.foo)
 
   kill $SERVER_PID
 }
-

test/config_with_file_override.sh

@@ -16,14 +16,14 @@ testcase_config_with_override_file() {
   assert_match "false" $(echo $stdout | jq .Compute.Enabled)
 
   # These are values set in the base config file that were not overridden
-  assert_match "bar" $(echo $stdout | jq .Compute.Labels.foo)
+  assert_match "bar" $(echo $stdout | jq .Labels.foo)
 
 
   # This value overrides the base config
   assert_match "hostname" $(echo $stdout | jq .NameProvider)
 
   # This value is merged between the configs
-  assert_match "boo" $(echo $stdout | jq .Compute.Labels.buz)
+  assert_match "boo" $(echo $stdout | jq .Labels.buz)
 
   kill $SERVER_PID
 }

test/config_with_file_override_and_flag.sh

@@ -18,12 +18,12 @@ testcase_config_with_override_config_file_and_flag() {
   assert_match "hostname" $(echo $stdout | jq .NameProvider)
 
   # overritten by the flag
-  assert_match "null" $(echo $stdout | jq .Compute.Labels.foo)
-  assert_match "null" $(echo $stdout | jq .Compute.Labels.buz)
+  assert_match "null" $(echo $stdout | jq .Labels.foo)
+  assert_match "null" $(echo $stdout | jq .Labels.buz)
 
 
   # This value is merged between the configs
-  assert_match "banana" $(echo $stdout | jq .Compute.Labels.apple)
+  assert_match "banana" $(echo $stdout | jq .Labels.apple)
 
   kill $SERVER_PID
 }

test/config_with_file_override_and_flag_and_config_flag.sh

@@ -3,7 +3,7 @@
 source bin/bacalhau.sh
 
 testcase_config_with_override_config_file_with_api_config_flag_and_dedicated_flag() {
-  start_bacalhau_serve_with_config -c $ROOT/testdata/config/base.yaml -c $ROOT/testdata/config/override.yaml --web-ui=false --config webui.enabled=true
+  start_bacalhau_serve_with_config -c $ROOT/testdata/config/base.yaml -c $ROOT/testdata/config/override.yaml --config webui.enabled=true
 
   subject curl -s http://localhost:1234/api/v1/agent/config
   assert_equal 0 $status > /dev/null
@@ -15,18 +15,17 @@ testcase_config_with_override_config_file_with_api_config_flag_and_dedicated_fla
   assert_match "false" $(echo $stdout | jq .Compute.Enabled)
 
   # These are values set in the base config file that were not overridden
-  assert_match "bar" $(echo $stdout | jq .Compute.Labels.foo)
+  assert_match "bar" $(echo $stdout | jq .Labels.foo)
 
 
   # This value overrides the base config
   assert_match "hostname" $(echo $stdout | jq .NameProvider)
 
   # This value is merged between the configs
-  assert_match "boo" $(echo $stdout | jq .Compute.Labels.buz)
+  assert_match "boo" $(echo $stdout | jq .Labels.buz)
 
   assert_match "true" $(echo $stdout | jq .WebUI.Enabled)
 
 
   kill $SERVER_PID
 }
-

test/errors.sh

@@ -3,8 +3,8 @@
 source bin/bacalhau.sh
 
 testcase_ranking_failures_are_printed() {
-    create_node compute,requester
+    create_node compute,orchestrator
 
-    subject bacalhau job run $ROOT/testdata/jobs/custom-task-type.yaml
-    assert_match 'does not support flibble' $(echo $stderr)
+    subject ${BACALHAU} job run $ROOT/testdata/jobs/custom-task-type.yaml
+    assert_match 'does not support flibble' $(echo $stdout)
 }

test/get-results.sh

@@ -4,13 +4,13 @@ source bin/bacalhau.sh
 
 testcase_can_get_results() {
     # Assuming create_node is a function that takes two arguments separated by space, not comma
-    create_node requester,compute
+    create_node orchestrator,compute
 
-    job_id=$(bacalhau job run --id-only $ROOT/testdata/jobs/docker-output.yaml)
-    bacalhau job get $job_id > /dev/null 2>&1
+    job_id=$(${BACALHAU} job run --id-only $ROOT/testdata/jobs/docker-output.yaml)
+    ${BACALHAU} job get $job_id > /dev/null 2>&1
     subject cat job-*/output_custom/output.txt
     assert_equal 0 $status
     assert_match "15" $(echo $stdout)
     assert_equal '' $stderr
     rm -rf job-${job_id%%-*}
-}
+}

test/hello-world-docker-v2.sh

@@ -3,11 +3,11 @@
 source bin/bacalhau.sh
 
 testcase_can_run_docker_hello_world() {
-    # Assuming create_node is a function that takes two arguments separated by comma, not space 
+    # Assuming create_node is a function that takes two arguments separated by comma, not space
     create_node requester,compute
 
-    subject bacalhau job run --follow $ROOT/testdata/jobs/docker-hello.yaml
+    subject ${BACALHAU} job run --follow $ROOT/testdata/jobs/docker-hello.yaml
     assert_equal 0 $status
     assert_match "Hello Bacalhau!" $(echo $stdout)
     assert_equal '' $stderr
-}
+}

test/labels.sh

@@ -4,14 +4,14 @@ source bin/bacalhau.sh
 
 run_test() {
     WORD=$RANDOM
-    subject bacalhau config set node.labels key=value "random=$WORD"
+    subject ${BACALHAU} config set labels "key=value,random=$WORD"
     create_node $1
 
     # Wait for node to have published information.
-    subject bacalhau node list --output=json
+    subject ${BACALHAU} node list --output=json
     while ! jq -e 'length > 0' <<< $stdout 1>/dev/null; do
         sleep 0.05;
-        subject bacalhau node list --output=json
+        subject ${BACALHAU} node list --output=json
     done
 
     assert_equal 1 $(jq -rcM length <<< $stdout)
@@ -22,10 +22,6 @@ run_test() {
     assert_equal $WORD $(jq -rcM '.[0].Info.Labels["random"]' <<< $stdout)
 }
 
-testcase_receive_labels_about_requester_node() {
-    run_test requester
-}
-
-testcase_receive_labels_about_compute_node() {
-    run_test requester,compute
+testcase_receive_labels_about_node() {
+    run_test compute,orchestrator
 }

test/list_nodes.sh

@@ -3,10 +3,10 @@
 source bin/bacalhau.sh
 
 testcase_can_list_nodes_and_count() {
-    create_node requester,compute
+    create_node orchestrator,compute
 
-    subject bacalhau node list --output json
+    subject ${BACALHAU} node list --output json
     assert_equal 0 $status
     assert_match '1' $(echo $stdout | jq length)
     assert_equal '' $stderr
-}
+}

test/logs.sh

@@ -3,9 +3,9 @@
 source bin/bacalhau.sh
 
 testcase_can_follow_job_logs() {
-    create_node requester,compute
+    create_node orchestrator,compute
 
-    subject bacalhau job run --follow $ROOT/testdata/jobs/wasm.yaml
+    subject ${BACALHAU} job run --follow $ROOT/testdata/jobs/wasm.yaml
     assert_equal 0 $status
     assert_match 'Hello, world!' $(echo $stdout | tail -n1)
     assert_equal '' $stderr

test/node_auth.sh

@@ -3,54 +3,39 @@
 source bin/bacalhau.sh
 
 testcase_node_can_connect_without_token() {
-    subject bacalhau config set node.network.type nats
-    create_node requester
+    create_node orchestrator
 
     create_node compute
     # If this returns successfully, the node started and authenticated.
 }
 
 testcase_preconfigured_token_not_printed() {
-    subject bacalhau config set node.network.type nats
-    subject bacalhau config set node.network.authsecret kerfuffle
+    subject ${BACALHAU} config set orchestrator.auth.token kerfuffle
     assert_equal 0 $status
 
-    create_node requester
-    assert_equal 0 $status
-
-    # check stdout
-    subject grep BACALHAU_NODE_NETWORK_ORCHESTRATORS $BACALHAU_DIR/out.log
-    assert_equal 0 $status
-    assert_not_match kerfuffle $stdout
-
-    # check bacalhau.run
-    subject grep BACALHAU_NODE_NETWORK_ORCHESTRATORS $BACALHAU_DIR/bacalhau.run
+    create_node orchestrator
     assert_equal 0 $status
     assert_not_match kerfuffle $stdout
 }
 
 testcase_node_connects_with_preconfigured_token() {
-    subject bacalhau config set node.network.type nats
-    subject bacalhau config set node.network.authsecret kerfuffle
+    subject ${BACALHAU} config set orchestrator.auth.token kerfuffle
     assert_match 0 $status
-    create_node requester
+    create_node orchestrator
 
-    subject bacalhau config set node.network.authsecret kerfuffle
-    subject bacalhau config set node.network.type nats
+    subject ${BACALHAU} config set orchestrator.auth.token kerfuffle
     create_node compute
     # If this returns successfully, the node started and authenticated.
 }
 
 testcase_node_connects_with_url_embedded_token() {
-    subject bacalhau config set node.network.type nats
-    subject bacalhau config set node.network.authsecret kerfuffle
+    subject ${BACALHAU} config set orchestrator.auth.token kerfuffle
     assert_match 0 $status
-    create_node requester
+    create_node orchestrator
 
 
     # remove the token from the config
-    subject bacalhau config set node.network.authsecret ""
-    subject bacalhau config set node.network.type nats
+    subject ${BACALHAU} config set orchestrator.auth.token ""
 
     # add the token to the orchestrator URL
     export BACALHAU_NODE_NETWORK_ORCHESTRATORS=$(echo $BACALHAU_NODE_NETWORK_ORCHESTRATORS | sed "s|nats://|nats://kerfuffle@|")
@@ -60,14 +45,12 @@ testcase_node_connects_with_url_embedded_token() {
 }
 
 testcase_node_cannot_connect_with_wrong_token() {
-    subject bacalhau config set node.network.type nats
-    subject bacalhau config set node.network.authsecret kerfuffle
+    subject ${BACALHAU} config set orchestrator.auth.token kerfuffle
     assert_match 0 $status
-    create_node requester
+    create_node orchestrator
 
-    subject bacalhau config set node.network.type nats
-    subject bacalhau config set node.network.authsecret kerfalafel
-    subject bacalhau serve --node-type compute
+    export BACALHAU_DIR=$(mktemp -d)
+    subject ${BACALHAU} serve --compute 1>$BACALHAU_DIR/out.log 2>$BACALHAU_DIR/err.log
     assert_not_equal 0 $status
-    assert_match "nats: Authorization Violation" $stderr
+    assert_match "nats: Authorization Violation" $stdout
 }