summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDessalines <tyhou13@gmx.com>2020-01-13 21:02:04 -0500
committerDessalines <tyhou13@gmx.com>2020-01-13 21:02:04 -0500
commit498ec2d8e07dd341df6e29f93f77fad8f6c4fea3 (patch)
treebb5a6681ae2c3fbeefceee5f250a1a798ebf0d84
parent8f32b84b5ab44e4b72b0ff7e7f4515a0a4835185 (diff)
Fix testing by using RUST_TEST_THREADS=1.
-rw-r--r--.travis.yml2
-rw-r--r--server/src/schema.rs52
2 files changed, 28 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml
index 78423282..32351c8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,5 +27,7 @@ script:
- cargo test
env:
- DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
+ - RUST_TEST_THREADS=1
+
addons:
postgresql: "9.4"
diff --git a/server/src/schema.rs b/server/src/schema.rs
index 61957067..bba39c30 100644
--- a/server/src/schema.rs
+++ b/server/src/schema.rs
@@ -335,30 +335,30 @@ joinable!(user_mention -> comment (comment_id));
joinable!(user_mention -> user_ (recipient_id));
allow_tables_to_appear_in_same_query!(
- category,
- comment,
- comment_like,
- comment_saved,
- community,
- community_follower,
- community_moderator,
- community_user_ban,
- mod_add,
- mod_add_community,
- mod_ban,
- mod_ban_from_community,
- mod_lock_post,
- mod_remove_comment,
- mod_remove_community,
- mod_remove_post,
- mod_sticky_post,
- password_reset_request,
- post,
- post_like,
- post_read,
- post_saved,
- site,
- user_,
- user_ban,
- user_mention,
+ category,
+ comment,
+ comment_like,
+ comment_saved,
+ community,
+ community_follower,
+ community_moderator,
+ community_user_ban,
+ mod_add,
+ mod_add_community,
+ mod_ban,
+ mod_ban_from_community,
+ mod_lock_post,
+ mod_remove_comment,
+ mod_remove_community,
+ mod_remove_post,
+ mod_sticky_post,
+ password_reset_request,
+ post,
+ post_like,
+ post_read,
+ post_saved,
+ site,
+ user_,
+ user_ban,
+ user_mention,
);