Skip to content

Commit c3cfbc8

Browse files
jyn514Joshua Nelson
jyn514
authored and
Joshua Nelson
committed
Fix tests
1 parent 4b5b548 commit c3cfbc8

File tree

10 files changed

+111
-97
lines changed

10 files changed

+111
-97
lines changed

‎src/db/blacklist.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ mod tests {
6969
let db = env.db();
7070

7171
// crates are added out of order to verify sorting
72-
add_crate(&db.conn(), "crate A")?;
73-
add_crate(&db.conn(), "crate C")?;
74-
add_crate(&db.conn(), "crate B")?;
72+
add_crate(&mut db.conn(), "crate A")?;
73+
add_crate(&mut db.conn(), "crate C")?;
74+
add_crate(&mut db.conn(), "crate B")?;
7575

76-
assert!(list_crates(&db.conn())? == vec!["crate A", "crate B", "crate C"]);
76+
assert!(list_crates(&mut db.conn())? == vec!["crate A", "crate B", "crate C"]);
7777
Ok(())
7878
});
7979
}
@@ -83,11 +83,11 @@ mod tests {
8383
crate::test::wrapper(|env| {
8484
let db = env.db();
8585

86-
assert!(!is_blacklisted(&db.conn(), "crate foo")?);
87-
add_crate(&db.conn(), "crate foo")?;
88-
assert!(is_blacklisted(&db.conn(), "crate foo")?);
89-
remove_crate(&db.conn(), "crate foo")?;
90-
assert!(!is_blacklisted(&db.conn(), "crate foo")?);
86+
assert!(!is_blacklisted(&mut db.conn(), "crate foo")?);
87+
add_crate(&mut db.conn(), "crate foo")?;
88+
assert!(is_blacklisted(&mut db.conn(), "crate foo")?);
89+
remove_crate(&mut db.conn(), "crate foo")?;
90+
assert!(!is_blacklisted(&mut db.conn(), "crate foo")?);
9191
Ok(())
9292
});
9393
}
@@ -97,9 +97,9 @@ mod tests {
9797
crate::test::wrapper(|env| {
9898
let db = env.db();
9999

100-
add_crate(&db.conn(), "crate foo")?;
101-
assert!(add_crate(&db.conn(), "crate foo").is_err());
102-
add_crate(&db.conn(), "crate bar")?;
100+
add_crate(&mut db.conn(), "crate foo")?;
101+
assert!(add_crate(&mut db.conn(), "crate foo").is_err());
102+
add_crate(&mut db.conn(), "crate bar")?;
103103

104104
Ok(())
105105
});
@@ -110,7 +110,7 @@ mod tests {
110110
crate::test::wrapper(|env| {
111111
let db = env.db();
112112

113-
assert!(remove_crate(&db.conn(), "crate foo").is_err());
113+
assert!(remove_crate(&mut db.conn(), "crate foo").is_err());
114114

115115
Ok(())
116116
});

‎src/db/delete.rs

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -152,25 +152,24 @@ mod tests {
152152
.create()?;
153153
let pkg2_id = env.fake_release().name("package-2").create()?;
154154

155-
assert!(crate_exists(&db.conn(), "package-1")?);
156-
assert!(crate_exists(&db.conn(), "package-2")?);
157-
assert!(release_exists(&db.conn(), pkg1_v1_id)?);
158-
assert!(release_exists(&db.conn(), pkg1_v2_id)?);
159-
assert!(release_exists(&db.conn(), pkg2_id)?);
155+
assert!(crate_exists(&mut db.conn(), "package-1")?);
156+
assert!(crate_exists(&mut db.conn(), "package-2")?);
157+
assert!(release_exists(&mut db.conn(), pkg1_v1_id)?);
158+
assert!(release_exists(&mut db.conn(), pkg1_v2_id)?);
159+
assert!(release_exists(&mut db.conn(), pkg2_id)?);
160160

161161
let pkg1_id = &db
162162
.conn()
163-
.query("SELECT id FROM crates WHERE name = 'package-1';", &[])?
164-
.get(0)
163+
.query("SELECT id FROM crates WHERE name = 'package-1';", &[])?[0]
165164
.get("id");
166165

167-
delete_crate_from_database(&db.conn(), "package-1", *pkg1_id)?;
166+
delete_crate_from_database(&mut db.conn(), "package-1", *pkg1_id)?;
168167

169-
assert!(!crate_exists(&db.conn(), "package-1")?);
170-
assert!(crate_exists(&db.conn(), "package-2")?);
171-
assert!(!release_exists(&db.conn(), pkg1_v1_id)?);
172-
assert!(!release_exists(&db.conn(), pkg1_v2_id)?);
173-
assert!(release_exists(&db.conn(), pkg2_id)?);
168+
assert!(!crate_exists(&mut db.conn(), "package-1")?);
169+
assert!(crate_exists(&mut db.conn(), "package-2")?);
170+
assert!(!release_exists(&mut db.conn(), pkg1_v1_id)?);
171+
assert!(!release_exists(&mut db.conn(), pkg1_v2_id)?);
172+
assert!(release_exists(&mut db.conn(), pkg2_id)?);
174173

175174
Ok(())
176175
});
@@ -206,8 +205,8 @@ mod tests {
206205
.version("2.0.0")
207206
.author("Peter Rabbit")
208207
.create()?;
209-
assert!(release_exists(&db.conn(), v1)?);
210-
assert!(release_exists(&db.conn(), v2)?);
208+
assert!(release_exists(&mut db.conn(), v1)?);
209+
assert!(release_exists(&mut db.conn(), v2)?);
211210
let crate_id = db
212211
.conn()
213212
.query("SELECT crate_id FROM releases WHERE id = $1", &[&v1])?
@@ -216,15 +215,15 @@ mod tests {
216215
.unwrap()
217216
.get(0);
218217
assert_eq!(
219-
authors(&db.conn(), crate_id)?,
218+
authors(&mut db.conn(), crate_id)?,
220219
vec!["malicious actor".to_string(), "Peter Rabbit".to_string()]
221220
);
222221

223-
delete_version(&db.conn(), &*env.storage(), "a", "1.0.0")?;
224-
assert!(!release_exists(&db.conn(), v1)?);
225-
assert!(release_exists(&db.conn(), v2)?);
222+
delete_version(&mut db.conn(), &*env.storage(), "a", "1.0.0")?;
223+
assert!(!release_exists(&mut db.conn(), v1)?);
224+
assert!(release_exists(&mut db.conn(), v2)?);
226225
assert_eq!(
227-
authors(&db.conn(), crate_id)?,
226+
authors(&mut db.conn(), crate_id)?,
228227
vec!["Peter Rabbit".to_string()]
229228
);
230229

‎src/docbuilder/limits.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ mod test {
8181

8282
let krate = "hexponent";
8383
// limits work if no crate has limits set
84-
let hexponent = Limits::for_crate(&db.conn(), krate)?;
84+
let hexponent = Limits::for_crate(&mut db.conn(), krate)?;
8585
assert_eq!(hexponent, Limits::default());
8686

8787
db.conn().query(
8888
"INSERT INTO sandbox_overrides (crate_name, max_targets) VALUES ($1, 15)",
8989
&[&krate],
9090
)?;
9191
// limits work if crate has limits set
92-
let hexponent = Limits::for_crate(&db.conn(), krate)?;
92+
let hexponent = Limits::for_crate(&mut db.conn(), krate)?;
9393
assert_eq!(
9494
hexponent,
9595
Limits {
@@ -111,7 +111,7 @@ mod test {
111111
VALUES ($1, $2, $3, $4)",
112112
&[&krate, &(limits.memory as i64), &(limits.timeout.as_secs() as i32), &(limits.targets as i32)]
113113
)?;
114-
assert_eq!(limits, Limits::for_crate(&db.conn(), krate)?);
114+
assert_eq!(limits, Limits::for_crate(&mut db.conn(), krate)?);
115115
Ok(())
116116
});
117117
}

‎src/test/fakes.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ impl<'a> FakeRelease<'a> {
248248
fs::write(crate_dir.join("README.md"), markdown)?;
249249
}
250250
let release_id = crate::db::add_package_into_database(
251-
&db.conn(),
251+
&mut db.conn(),
252252
&package,
253253
crate_dir,
254254
&self.build_result,
@@ -261,11 +261,11 @@ impl<'a> FakeRelease<'a> {
261261
algs,
262262
)?;
263263
crate::db::update_crate_data_in_database(
264-
&db.conn(),
264+
&mut db.conn(),
265265
&package.name,
266266
&self.registry_crate_data,
267267
)?;
268-
crate::db::add_build_into_database(&db.conn(), release_id, &self.build_result)?;
268+
crate::db::add_build_into_database(&mut db.conn(), release_id, &self.build_result)?;
269269

270270
Ok(release_id)
271271
}

‎src/test/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::Config;
88
use failure::Error;
99
use log::error;
1010
use once_cell::unsync::OnceCell;
11-
use postgres::Client;
11+
use postgres::Client as Connection;
1212
use reqwest::{
1313
blocking::{Client, RequestBuilder},
1414
Method,
@@ -229,7 +229,7 @@ impl TestDatabase {
229229
// test to create a fresh instance of the database to run within.
230230
let schema = format!("docs_rs_test_schema_{}", rand::random::<u64>());
231231

232-
let mut conn = Client::connect(config.database_url.as_str(), postgres::TlsMode::None)?;
232+
let mut conn = Connection::connect(&config.database_url, postgres::NoTls)?;
233233
conn.batch_execute(&format!(
234234
"
235235
CREATE SCHEMA {0};
@@ -281,11 +281,11 @@ impl TestDatabase {
281281

282282
impl Drop for TestDatabase {
283283
fn drop(&mut self) {
284-
crate::db::migrate(Some(0), &self.conn()).expect("downgrading database works");
285-
if let Err(e) = self
286-
.conn()
287-
.execute(&format!("DROP SCHEMA {} CASCADE;", self.schema), &[])
288-
{
284+
crate::db::migrate(Some(0), &mut self.conn()).expect("downgrading database works");
285+
if let Err(e) = self.conn().execute(
286+
format!("DROP SCHEMA {} CASCADE;", self.schema).as_str(),
287+
&[],
288+
) {
289289
error!("failed to drop test schema {}: {}", self.schema, e);
290290
}
291291
}

‎src/utils/queue.rs

Lines changed: 43 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -56,28 +56,34 @@ mod tests {
5656
wrapper(|env| {
5757
let db = env.db();
5858

59-
set_crate_priority(&db.conn(), "cratesfyi-%", -100)?;
60-
assert_eq!(get_crate_priority(&db.conn(), "cratesfyi-database")?, -100);
61-
assert_eq!(get_crate_priority(&db.conn(), "cratesfyi-")?, -100);
62-
assert_eq!(get_crate_priority(&db.conn(), "cratesfyi-s3")?, -100);
63-
assert_eq!(get_crate_priority(&db.conn(), "cratesfyi-webserver")?, -100);
59+
set_crate_priority(&mut db.conn(), "cratesfyi-%", -100)?;
6460
assert_eq!(
65-
get_crate_priority(&db.conn(), "cratesfyi")?,
61+
get_crate_priority(&mut db.conn(), "cratesfyi-database")?,
62+
-100
63+
);
64+
assert_eq!(get_crate_priority(&mut db.conn(), "cratesfyi-")?, -100);
65+
assert_eq!(get_crate_priority(&mut db.conn(), "cratesfyi-s3")?, -100);
66+
assert_eq!(
67+
get_crate_priority(&mut db.conn(), "cratesfyi-webserver")?,
68+
-100
69+
);
70+
assert_eq!(
71+
get_crate_priority(&mut db.conn(), "cratesfyi")?,
6672
DEFAULT_PRIORITY
6773
);
6874

69-
set_crate_priority(&db.conn(), "_c_", 100)?;
70-
assert_eq!(get_crate_priority(&db.conn(), "rcc")?, 100);
71-
assert_eq!(get_crate_priority(&db.conn(), "rc")?, DEFAULT_PRIORITY);
75+
set_crate_priority(&mut db.conn(), "_c_", 100)?;
76+
assert_eq!(get_crate_priority(&mut db.conn(), "rcc")?, 100);
77+
assert_eq!(get_crate_priority(&mut db.conn(), "rc")?, DEFAULT_PRIORITY);
7278

73-
set_crate_priority(&db.conn(), "hexponent", 10)?;
74-
assert_eq!(get_crate_priority(&db.conn(), "hexponent")?, 10);
79+
set_crate_priority(&mut db.conn(), "hexponent", 10)?;
80+
assert_eq!(get_crate_priority(&mut db.conn(), "hexponent")?, 10);
7581
assert_eq!(
76-
get_crate_priority(&db.conn(), "hexponents")?,
82+
get_crate_priority(&mut db.conn(), "hexponents")?,
7783
DEFAULT_PRIORITY
7884
);
7985
assert_eq!(
80-
get_crate_priority(&db.conn(), "floathexponent")?,
86+
get_crate_priority(&mut db.conn(), "floathexponent")?,
8187
DEFAULT_PRIORITY
8288
);
8389

@@ -90,15 +96,15 @@ mod tests {
9096
wrapper(|env| {
9197
let db = env.db();
9298

93-
set_crate_priority(&db.conn(), "cratesfyi-%", -100)?;
94-
assert_eq!(get_crate_priority(&db.conn(), "cratesfyi-")?, -100);
99+
set_crate_priority(&mut db.conn(), "cratesfyi-%", -100)?;
100+
assert_eq!(get_crate_priority(&mut db.conn(), "cratesfyi-")?, -100);
95101

96102
assert_eq!(
97-
remove_crate_priority(&db.conn(), "cratesfyi-%")?,
103+
remove_crate_priority(&mut db.conn(), "cratesfyi-%")?,
98104
Some(-100)
99105
);
100106
assert_eq!(
101-
get_crate_priority(&db.conn(), "cratesfyi-")?,
107+
get_crate_priority(&mut db.conn(), "cratesfyi-")?,
102108
DEFAULT_PRIORITY
103109
);
104110

@@ -111,14 +117,20 @@ mod tests {
111117
wrapper(|env| {
112118
let db = env.db();
113119

114-
set_crate_priority(&db.conn(), "cratesfyi-%", -100)?;
120+
set_crate_priority(&mut db.conn(), "cratesfyi-%", -100)?;
115121

116-
assert_eq!(get_crate_priority(&db.conn(), "cratesfyi-database")?, -100);
117-
assert_eq!(get_crate_priority(&db.conn(), "cratesfyi-")?, -100);
118-
assert_eq!(get_crate_priority(&db.conn(), "cratesfyi-s3")?, -100);
119-
assert_eq!(get_crate_priority(&db.conn(), "cratesfyi-webserver")?, -100);
120122
assert_eq!(
121-
get_crate_priority(&db.conn(), "unrelated")?,
123+
get_crate_priority(&mut db.conn(), "cratesfyi-database")?,
124+
-100
125+
);
126+
assert_eq!(get_crate_priority(&mut db.conn(), "cratesfyi-")?, -100);
127+
assert_eq!(get_crate_priority(&mut db.conn(), "cratesfyi-s3")?, -100);
128+
assert_eq!(
129+
get_crate_priority(&mut db.conn(), "cratesfyi-webserver")?,
130+
-100
131+
);
132+
assert_eq!(
133+
get_crate_priority(&mut db.conn(), "unrelated")?,
122134
DEFAULT_PRIORITY
123135
);
124136

@@ -132,17 +144,20 @@ mod tests {
132144
let db = env.db();
133145

134146
assert_eq!(
135-
get_crate_priority(&db.conn(), "cratesfyi")?,
147+
get_crate_priority(&mut db.conn(), "cratesfyi")?,
148+
DEFAULT_PRIORITY
149+
);
150+
assert_eq!(get_crate_priority(&mut db.conn(), "rcc")?, DEFAULT_PRIORITY);
151+
assert_eq!(
152+
get_crate_priority(&mut db.conn(), "lasso")?,
136153
DEFAULT_PRIORITY
137154
);
138-
assert_eq!(get_crate_priority(&db.conn(), "rcc")?, DEFAULT_PRIORITY);
139-
assert_eq!(get_crate_priority(&db.conn(), "lasso")?, DEFAULT_PRIORITY);
140155
assert_eq!(
141-
get_crate_priority(&db.conn(), "hexponent")?,
156+
get_crate_priority(&mut db.conn(), "hexponent")?,
142157
DEFAULT_PRIORITY
143158
);
144159
assert_eq!(
145-
get_crate_priority(&db.conn(), "rust4lyfe")?,
160+
get_crate_priority(&mut db.conn(), "rust4lyfe")?,
146161
DEFAULT_PRIORITY
147162
);
148163

0 commit comments

Comments
 (0)