Skip to content

Commit 93cf0e5

Browse files
author
Zeke Foppa
committed
[release/candidate/v0.9.0]: cherrypick #1115: Fail CI on smoketest failures
1 parent 62fb8ef commit 93cf0e5

4 files changed

Lines changed: 9 additions & 6 deletions

File tree

smoketests/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def reset_config(cls):
143143

144144
def fingerprint(self):
145145
# Fetch the server's fingerprint; required for `identity list`.
146-
self.spacetime("server", "fingerprint", "localhost", "-f")
146+
self.spacetime("server", "fingerprint", "-s", "localhost", "-f")
147147

148148
def new_identity(self, *, email, default=False):
149149
output = self.spacetime("identity", "new", "--no-email" if email is None else f"--email={email}")

smoketests/__main__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ def main():
9090
unittest_parallel.main(buffer=buffer, verbose=verbosity, level="class", discovered_tests=tests, jobs=args.jobs)
9191
else:
9292
result = unittest.TextTestRunner(buffer=buffer, verbosity=verbosity).run(tests)
93+
if not result.wasSuccessful():
94+
parser.exit(status=1)
9395

9496

9597
if __name__ == '__main__':

smoketests/tests/modules.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,10 @@ class UploadModule2(Smoketest):
147147
spacetimedb::schedule!("100ms", my_repeating_reducer(Timestamp::now()));
148148
}
149149
150-
#[spacetimedb(reducer, repeat = 100ms)]
150+
#[spacetimedb(reducer)]
151151
pub fn my_repeating_reducer(prev: Timestamp) {
152152
println!("Invoked: ts={:?}, delta={:?}", Timestamp::now(), prev.elapsed());
153+
spacetimedb::schedule!("100ms", my_repeating_reducer(Timestamp::now()));
153154
}
154155
"""
155156
def test_upload_module_2(self):

smoketests/tests/servers.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ def test_servers(self):
1515
self.assertRegex(servers, re.compile(r"^\s*testnet\.spacetimedb\.com\s+https\s+testnet\s*$", re.M))
1616
self.assertRegex(servers, re.compile(r"^\s*\*\*\*\s+127\.0\.0\.1:3000\s+http\s+localhost\s*$", re.M))
1717

18-
out = self.spacetime("server", "fingerprint", "127.0.0.1:3000", "-f")
18+
out = self.spacetime("server", "fingerprint", "-s", "http://127.0.0.1:3000", "-f")
1919
self.assertIn("No saved fingerprint for server 127.0.0.1:3000.", out)
2020

21-
out = self.spacetime("server", "fingerprint", "127.0.0.1:3000")
21+
out = self.spacetime("server", "fingerprint", "-s", "http://127.0.0.1:3000")
2222
self.assertIn("Fingerprint is unchanged for server 127.0.0.1:3000", out)
2323

24-
out = self.spacetime("server", "fingerprint", "localhost")
25-
self.assertIn("Fingerprint is unchanged for server localhost", out)
24+
out = self.spacetime("server", "fingerprint", "-s", "localhost")
25+
self.assertIn("Fingerprint is unchanged for server localhost", out)

0 commit comments

Comments
 (0)