Smoketests run in parallel

.github/workflows/ci.yml

@@ -9,21 +9,21 @@ name: CI
 jobs:
   docker_smoketests:
     name: Smoketests
-    runs-on: ubuntu-latest
+    runs-on: spacetimedb-runner
     steps:
-      - uses: actions/checkout@v3
-
+      - name: Checkout sources
+        uses: actions/checkout@v3
       - name: Start containers
         run: docker compose up -d
       - name: Run smoketests
-        run: test/run-smoke-tests.sh -x bitcraftmini-pretest
+        run: test/run-smoke-tests.sh --parallel -x bitcraftmini-pretest
       - name: Stop containers 
         if: always()
         run: docker compose down
 
   test:
     name: Test Suite
-    runs-on: ubuntu-latest
+    runs-on: spacetimedb-runner
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
@@ -40,7 +40,7 @@ jobs:
 
   lints:
     name: Lints
-    runs-on: ubuntu-latest
+    runs-on: spacetimedb-runner
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
@@ -56,7 +56,7 @@ jobs:
 
   wasm_bindings:
     name: Build and test wasm bindings
-    runs-on: ubuntu-latest
+    runs-on: spacetimedb-runner
     steps:
       - uses: actions/checkout@v3
 

crates/cli/src/config.rs

@@ -141,9 +141,12 @@ impl Config {
         config_filename
     }
 
-    fn load_raw(config_dir: PathBuf) -> RawConfig {
-        if let Some(config_path) = std::env::var_os("SPACETIME_CONFIG_FILE") {
-            return Self::load_from_file(config_path.as_ref());
+    fn load_raw(config_dir: PathBuf, is_project: bool) -> RawConfig {
+        // If a config file overload has been specified, use that instead
+        if !is_project {
+            if let Some(config_path) = std::env::var_os("SPACETIME_CONFIG_FILE") {
+                return Self::load_from_file(config_path.as_ref());
+            }
         }
         if !config_dir.exists() {
             fs::create_dir_all(&config_dir).unwrap();
@@ -174,7 +177,7 @@ impl Config {
 
     pub fn load() -> Self {
         let home_dir = dirs::home_dir().unwrap();
-        let mut home_config = Self::load_raw(home_dir.join(HOME_CONFIG_DIR));
+        let mut home_config = Self::load_raw(home_dir.join(HOME_CONFIG_DIR), false);
 
         // Ensure there is always an identity config. Simplifies other code.
         home_config.identity_configs.get_or_insert(vec![]);
@@ -184,7 +187,7 @@ impl Config {
         // search parent directories above the current directory to find
         // spacetime.toml files like a .gitignore file
         let cur_dir = std::env::current_dir().expect("No current working directory!");
-        let cur_config = Self::load_raw(cur_dir);
+        let cur_config = Self::load_raw(cur_dir, true);
 
         Self {
             home: home_config,
@@ -193,15 +196,19 @@ impl Config {
     }
 
     pub fn save(&self) {
-        let home_dir = dirs::home_dir().unwrap();
-        let config_dir = home_dir.join(HOME_CONFIG_DIR);
-        if !config_dir.exists() {
-            fs::create_dir_all(&config_dir).unwrap();
-        }
+        let config_path = if let Some(config_path) = std::env::var_os("SPACETIME_CONFIG_FILE") {
+            PathBuf::from(&config_path)
+        } else {
+            let home_dir = dirs::home_dir().unwrap();
+            let config_dir = home_dir.join(HOME_CONFIG_DIR);
+            if !config_dir.exists() {
+                fs::create_dir_all(&config_dir).unwrap();
+            }
 
-        let config_filename = Self::find_config_filename(&config_dir).unwrap_or(CONFIG_FILENAME);
+            let config_filename = Self::find_config_filename(&config_dir).unwrap_or(CONFIG_FILENAME);
+            config_dir.join(config_filename)
+        };
 
-        let config_path = config_dir.join(config_filename);
         let mut file = fs::OpenOptions::new()
             .create(true)
             .write(true)

crates/cli/src/util.rs

@@ -110,7 +110,7 @@ pub struct InitDefaultResult {
 
 pub async fn init_default(config: &mut Config, nickname: Option<String>) -> Result<InitDefaultResult, anyhow::Error> {
     if config.name_exists(nickname.as_ref().unwrap_or(&"".to_string())) {
-        return Err(anyhow::anyhow!("An identity with that name already exists."));
+        return Err(anyhow::anyhow!("A default identity already exists."));
     }
 
     let client = reqwest::Client::new();

docker-compose-release.yml

@@ -31,19 +31,5 @@ services:
       core:
         soft: -1
         hard: -1
-
-  prometheus:
-    build:
-      context: ./packages/prometheus
-    ports:
-      - "9090:9090"
-    volumes:
-      - ./packages/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
-
-  grafana:
-    build:
-      context: ./packages/grafana
-    ports:
-      - "3001:3000"
 volumes:
   key_files:

test/lib.include

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# Runs a test with the assumption that it will return a zero result code
 run_test() {
 	set +e
 	"$@" > "$TEST_OUT" 2>&1
@@ -9,6 +10,7 @@ run_test() {
 	return "$RESULT"
 }
 
+# Runs a test with the assumption that it will return a non-zero result code
 run_fail_test() {
 	if "$@" > "$TEST_OUT" 2>&1 ; then
 		cat "$TEST_OUT"
@@ -18,39 +20,19 @@ run_fail_test() {
 	return 0
 }
 
+# This resets the spacetime config for a new test run
 reset_config() {
-	RETURN_DIR=$PWD
-	cd "$SPACETIME_HOME" || exit 1
-	cp "./test/config.toml" "$HOME/.spacetime/config.toml"
-	cd "$RETURN_DIR" || exit 1
+	SPACETIME_CONFIG_FILE="$(mktemp)"
+	export SPACETIME_CONFIG_FILE
+	cp "$RESET_SPACETIME_CONFIG" "$SPACETIME_CONFIG_FILE"
 }
 
 # This deletes the project from the previous test run
 reset_project() {
-	RETURN_DIR=$PWD
-	if [ -d "$PROJECT_PATH" ] ; then
-		rm -rf "$PROJECT_PATH"
-	fi
-
-	cd "$RETURN_DIR" || exit 1
-}
-
-# This creates a new spacetime project that is completely dependent on the local repository.
-create_project() {
-	reset_project
-	run_test cargo run init --lang=rust "$PROJECT_PATH"
-	# We have to force using the local spacetimedb_bindings otherwise we will download them from crates.io
-	if [[ "$OSTYPE" == "darwin"* ]]; then
-		sed -i '' "s@.*spacetimedb.*=.*@spacetimedb = { path = \"${SPACETIME_DIR}/crates/bindings\" }@g" "${PROJECT_PATH}/Cargo.toml" 
-    elif [[ "$OSTYPE" == "msys"* ]]; then
-        # Running in git bash; do horrible path conversion; yes we do need all of those
-        WINPATH="$(cygpath -w "${SPACETIME_DIR}/crates/bindings" | sed 's/\\/\\\\\\\\/g')"
-		sed -i "s@.*spacetimedb.*=.*@spacetimedb = { path = \"${WINPATH}\" }@g" "${PROJECT_PATH}/Cargo.toml" 
-	else
-		sed -i "s@.*spacetimedb.*=.*@spacetimedb = { path = \"${SPACETIME_DIR}/crates/bindings\" }@g" "${PROJECT_PATH}/Cargo.toml"
-	fi
-
-
+	PROJECT_PATH="$(mktemp -d)"
+	rmdir "$PROJECT_PATH"
+	cp -rp "$RESET_PROJECT_PATH" "$PROJECT_PATH"
+	export PROJECT_PATH
 }
 
 random_string() {
@@ -65,7 +47,7 @@ spacetime_publish() {
 	RETURN_DIR=$PWD
 	cd "$SPACETIME_DIR"
 	set +e
-	run_test cargo run publish "$@"
+	run_test spacetime publish "$@"
 	RESULT_CODE=$?
 	cd "$RETURN_DIR" || exit 1
 	set -e
@@ -74,10 +56,17 @@ spacetime_publish() {
 
 fsed() {
 	if [[ "$OSTYPE" == "darwin"* ]]; then
-        sed -i.sed_bak "$@"
-        rm -f rm *.sed_bak
+		sed -i.sed_bak "$@"
+		rm -f rm *.sed_bak
 	else
-        sed -i "$@"
+		sed -i "$@"
 	fi
 }
 
+restart_docker() {
+	docker-compose stop node
+	docker-compose start node
+	sleep 10
+}
+
+# vim: noexpandtab tabstop=4 shiftwidth=4