Enable CI for Windows (ordinals#603)

Author: casey

.gitattributes

@@ -0,0 +1 @@
+* -text

.github/workflows/ci.yaml

@@ -17,8 +17,9 @@ jobs:
     strategy:
       matrix:
         os:
-        - ubuntu-latest
         - macos-latest
+        - ubuntu-latest
+        - windows-latest
 
     runs-on: ${{matrix.os}}
 
@@ -41,8 +42,13 @@ jobs:
       run: cargo update --locked --package ord
 
     - name: Test
+      if: ${{ matrix.os != 'windows-latest' }}
       run: cargo test --all
 
+    - name: Build Tests
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: cargo build --tests
+
     - name: Clippy
       run: cargo clippy --all --all-targets
 

Cargo.lock

@@ -50,7 +50,6 @@ tower-http = { version = "0.3.3", features = ["cors"] }
 
 [dev-dependencies]
 executable-path = "1.0.0"
-nix = "0.25.0"
 pretty_assertions = "1.2.1"
 tempfile = "3.2.0"
 test-bitcoincore-rpc = { path = "test-bitcoincore-rpc" }

Cargo.toml

@@ -1,10 +1,5 @@
 use super::*;
 
-enum ExpectedExitStatus {
-  Code(i32),
-  Signal(Signal),
-}
-
 pub(crate) struct Output {
   pub(crate) tempdir: TempDir,
   pub(crate) stdout: String,
@@ -34,7 +29,7 @@ impl<const N: usize> ToArgs for [&str; N] {
 
 pub(crate) struct CommandBuilder {
   args: Vec<String>,
-  expected_exit_status: ExpectedExitStatus,
+  expected_exit_code: i32,
   expected_stderr: Expected,
   expected_stdout: Expected,
   rpc_server_url: Option<String>,
@@ -45,7 +40,7 @@ impl CommandBuilder {
   pub(crate) fn new(args: impl ToArgs) -> Self {
     Self {
       args: args.to_args(),
-      expected_exit_status: ExpectedExitStatus::Code(0),
+      expected_exit_code: 0,
       expected_stderr: Expected::String(String::new()),
       expected_stdout: Expected::String(String::new()),
       rpc_server_url: None,
@@ -88,16 +83,9 @@ impl CommandBuilder {
     }
   }
 
-  pub(crate) fn expected_exit_code(self, expected_status: i32) -> Self {
-    Self {
-      expected_exit_status: ExpectedExitStatus::Code(expected_status),
-      ..self
-    }
-  }
-
-  pub(crate) fn expected_exit_signal(self, expected_signal: Signal) -> Self {
+  pub(crate) fn expected_exit_code(self, expected_exit_code: i32) -> Self {
     Self {
-      expected_exit_status: ExpectedExitStatus::Signal(expected_signal),
+      expected_exit_code,
       ..self
     }
   }
@@ -131,10 +119,7 @@ impl CommandBuilder {
     let stdout = str::from_utf8(&output.stdout).unwrap();
     let stderr = str::from_utf8(&output.stderr).unwrap();
 
-    if match self.expected_exit_status {
-      ExpectedExitStatus::Code(code) => output.status.code() != Some(code),
-      ExpectedExitStatus::Signal(signal) => output.status.signal() != Some(signal as i32),
-    } {
+    if output.status.code() != Some(self.expected_exit_code) {
       panic!(
         "Test failed: {}\nstdout:\n{}\nstderr:\n{}",
         output.status, stdout, stderr

tests/command_builder.rs

@@ -4,14 +4,12 @@ use {
   self::{command_builder::CommandBuilder, expected::Expected},
   bitcoin::{blockdata::constants::COIN_VALUE, Network, OutPoint},
   executable_path::executable_path,
-  nix::{sys::signal::Signal, unistd::Pid},
   pretty_assertions::assert_eq as pretty_assert_eq,
   regex::Regex,
   reqwest::{StatusCode, Url},
   std::{
     fs,
     net::TcpListener,
-    os::unix::process::ExitStatusExt,
     process::{self, Child, Command, Stdio},
     str, thread,
     time::Duration,

tests/lib.rs

@@ -4,21 +4,32 @@ use super::*;
 fn run() {
   let rpc_server = test_bitcoincore_rpc::spawn();
 
-  let builder = CommandBuilder::new("server")
-    .rpc_server(&rpc_server)
-    .expected_exit_signal(Signal::SIGINT);
+  let port = TcpListener::bind("127.0.0.1:0")
+    .unwrap()
+    .local_addr()
+    .unwrap()
+    .port();
+
+  let builder = CommandBuilder::new(format!("server --http-port {}", port)).rpc_server(&rpc_server);
 
   let mut command = builder.command();
 
   let mut child = command.spawn().unwrap();
 
-  nix::sys::signal::kill(
-    Pid::from_raw(child.id().try_into().unwrap()),
-    Signal::SIGINT,
-  )
-  .unwrap();
+  for attempt in 0.. {
+    if let Ok(response) = reqwest::blocking::get(format!("http://localhost:{port}/status")) {
+      if response.status() == 200 {
+        assert_eq!(response.text().unwrap(), "OK");
+        break;
+      }
+    }
 
-  child.kill().unwrap();
+    if attempt == 100 {
+      panic!("Server did not respond to status check",);
+    }
 
-  builder.check(child.wait_with_output().unwrap());
+    thread::sleep(Duration::from_millis(50));
+  }
+
+  child.kill().unwrap();
 }